From 5142ac2389e78effcdbf57c83dbd272f92dd25f7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Feb 2016 13:13:06 -0800 Subject: [PATCH 1/2] Docs: Add captions above progress bars; refs #17264 [skip sauce] --- docs/components/progress.md | 65 +++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/docs/components/progress.md b/docs/components/progress.md index 480da4903e..5a9be36f7b 100644 --- a/docs/components/progress.md +++ b/docs/components/progress.md @@ -14,11 +14,21 @@ Stylize [the HTML5 `` element](https://developer.mozilla.org/en-US/doc ### Example {% example html %} -0% -25% -50% -75% -100% + +
Reticulating splines… 0%
+ + +
Reticulating splines… 25%
+ + +
Reticulating splines… 50%
+ + +
Reticulating splines… 75%
+ + +
Reticulating splines… 100%
+ {% endexample %} ### IE9 support @@ -26,9 +36,10 @@ Stylize [the HTML5 `` element](https://developer.mozilla.org/en-US/doc Internet Explorer 9 doesn't support the HTML5 `` element, but we can work around that. {% example html %} - +
Reticulating splines… 25%
+
- 25% +
{% endexample %} @@ -38,10 +49,17 @@ Internet Explorer 9 doesn't support the HTML5 `` element, but we can w Progress bars use some of the same button and alert classes for consistent styles. {% example html %} -25% -50% -75% -100% +
Reticulating successful splines… 25%
+ + +
Reticulating informative splines… 50%
+ + +
Reticulating warning splines… 75%
+ + +
Reticulating dangerous splines… 100%
+ {% endexample %} ### Striped @@ -49,11 +67,20 @@ Progress bars use some of the same button and alert classes for consistent style Uses a gradient to create a striped effect. {% example html %} -10% -25% -50% -75% -100% +
Reticulating plain splines… 10%
+10% + +
Reticulating successful splines… 25%
+25% + +
Reticulating informative splines… 50%
+50% + +
Reticulating warning splines… 75%
+75% + +
Reticulating dangerous splines… 100%
+100% {% endexample %} ### Animated stripes @@ -63,12 +90,14 @@ The striped gradient can also be animated. Add `.progress-animated` to `.progres **Animated progress bars do not work in IE9 and Opera 12** – as they don't support CSS3 animations – **nor in IE10+ and Microsoft Edge** – as they currently don't support CSS3 animations on the [`::-ms-fill` pseudo-element](https://msdn.microsoft.com/en-us/library/windows/apps/hh465757.aspx).
- 25% +
Reticulating splines… 25%
+ 25%
{% highlight html %} -25% +
Reticulating splines… 25%
+25% {% endhighlight %} From 72f10dd7e6a763b3258779280d89531b3038b35d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 8 Feb 2016 00:31:10 -0800 Subject: [PATCH 2/2] Only caption 1st set of progress bar examples --- docs/components/progress.md | 42 ++++++++++++------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/docs/components/progress.md b/docs/components/progress.md index 5a9be36f7b..57028c9724 100644 --- a/docs/components/progress.md +++ b/docs/components/progress.md @@ -13,6 +13,8 @@ Stylize [the HTML5 `` element](https://developer.mozilla.org/en-US/doc ### Example +To caption a progress bar, simply add a `
` with your caption text, [align the text using a utility class]({{ site.baseurl }}/components/utilities/#text-alignment), and associate the caption with the `` element using the `aria-describedby` attribute. + {% example html %}
Reticulating splines… 0%
@@ -49,17 +51,10 @@ Internet Explorer 9 doesn't support the HTML5 `` element, but we can w Progress bars use some of the same button and alert classes for consistent styles. {% example html %} -
Reticulating successful splines… 25%
- - -
Reticulating informative splines… 50%
- - -
Reticulating warning splines… 75%
- - -
Reticulating dangerous splines… 100%
- + + + + {% endexample %} ### Striped @@ -67,20 +62,11 @@ Progress bars use some of the same button and alert classes for consistent style Uses a gradient to create a striped effect. {% example html %} -
Reticulating plain splines… 10%
-10% - -
Reticulating successful splines… 25%
-25% - -
Reticulating informative splines… 50%
-50% - -
Reticulating warning splines… 75%
-75% - -
Reticulating dangerous splines… 100%
-100% + + + + + {% endexample %} ### Animated stripes @@ -90,14 +76,12 @@ The striped gradient can also be animated. Add `.progress-animated` to `.progres **Animated progress bars do not work in IE9 and Opera 12** – as they don't support CSS3 animations – **nor in IE10+ and Microsoft Edge** – as they currently don't support CSS3 animations on the [`::-ms-fill` pseudo-element](https://msdn.microsoft.com/en-us/library/windows/apps/hh465757.aspx).
-
Reticulating splines… 25%
- 25% +
{% highlight html %} -
Reticulating splines… 25%
-25% + {% endhighlight %}