diff --git a/docs/components.html b/docs/components.html
index 990f31ae6e..873bff63d9 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -90,7 +90,7 @@
Navbar
Breadcrumbs
Pagination
- Labels and badges
+ Badges
Typography
Thumbnails
Alerts
@@ -327,7 +327,7 @@
Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the JavaScript docs for that.
Dropdowns in button groups
- Heads up! Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.
+ Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.
@@ -1511,73 +1511,13 @@
-
-
+
- Labels
-
-
-
- | Labels |
- Markup |
-
-
-
-
- |
- Default
- |
-
- <span class="label">Default</span>
- |
-
-
- |
- Success
- |
-
- <span class="label label-success">Success</span>
- |
-
-
- |
- Warning
- |
-
- <span class="label label-warning">Warning</span>
- |
-
-
- |
- Danger
- |
-
- <span class="label label-danger">Danger</span>
- |
-
-
- |
- Info
- |
-
- <span class="label label-info">Info</span>
- |
-
-
- |
- Inverse
- |
-
- <span class="label label-inverse">Inverse</span>
- |
-
-
-
- Badges
Easily collapsible
- For easy implementation, labels and badges will simply collapse (via CSS's :empty selector) when no content exists within.
+ For easy implementation, badges will simply collapse (via CSS's :empty selector) when no content exists within.
diff --git a/docs/css.html b/docs/css.html
index d9262dc575..51fa3ee094 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -303,7 +303,7 @@
<em>rendered as italicized text</em>
- Heads up! Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
+ Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
Emphasis classes
Convey meaning through color with a handful of emphasis utility classes.
@@ -567,8 +567,8 @@
<dd>...</dd>
</dl>
+ Auto-truncating
- Heads up!
Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.
@@ -601,7 +601,6 @@ For example, <code><section></code> should be wrapped as inlin
<p>Sample text here...</p>
</pre>
- Heads up! Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.
@@ -1841,7 +1840,6 @@ For example, <code><section></code> should be wrapped as inlin
<a href="#" class="btn btn-large disabled">Link</a>
- Heads up!
We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. Also, this class is only for aesthetic; you must use custom JavaScript to disable links here.
@@ -1884,7 +1882,7 @@ For example, <code><section></code> should be wrapped as inlin
Images
- Add classes to an <img> element to easily style images in any project.
+ Add classes to an <img> element to easily style images in any project. Rounded corners are not available in IE8.
![]()
![]()
@@ -1895,8 +1893,6 @@ For example, <code><section></code> should be wrapped as inlin
<img src="..." class="img-circle">
<img src="..." class="img-polaroid">
-
Heads up! .img-rounded and .img-circle do not work in IE8 due to lack of border-radius support.
-
@@ -2094,10 +2090,7 @@ For example, <code><section></code> should be wrapped as inlin
<i class="glyphicon-search"></i>
Want to change the icon color? Just change the color of the parent element.
-
- Heads up!
- When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.
-
+
When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index ad37836b06..f9fbaf4cbb 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -22,7 +22,7 @@
Navbar
Breadcrumbs
Pagination
-
Labels and badges
+
Badges
Typography
Thumbnails
Alerts
@@ -259,7 +259,7 @@
Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the JavaScript docs for that.
Dropdowns in button groups
-
Heads up! Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.
+
Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.
@@ -1443,73 +1443,13 @@
-
-
+
- Labels
-
-
-
- | Labels |
- Markup |
-
-
-
-
- |
- Default
- |
-
- <span class="label">Default</span>
- |
-
-
- |
- Success
- |
-
- <span class="label label-success">Success</span>
- |
-
-
- |
- Warning
- |
-
- <span class="label label-warning">Warning</span>
- |
-
-
- |
- Danger
- |
-
- <span class="label label-danger">Danger</span>
- |
-
-
- |
- Info
- |
-
- <span class="label label-info">Info</span>
- |
-
-
- |
- Inverse
- |
-
- <span class="label label-inverse">Inverse</span>
- |
-
-
-
- Badges
Easily collapsible
- For easy implementation, labels and badges will simply collapse (via CSS's :empty selector) when no content exists within.
+ For easy implementation, badges will simply collapse (via CSS's :empty selector) when no content exists within.
diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache
index e8727204f9..27158c01f4 100644
--- a/docs/templates/pages/css.mustache
+++ b/docs/templates/pages/css.mustache
@@ -240,7 +240,7 @@
<em>rendered as italicized text</em>
- Heads up! Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
+ Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
Emphasis classes
Convey meaning through color with a handful of emphasis utility classes.
@@ -507,8 +507,8 @@
<dd>...</dd>
</dl>
+ Auto-truncating
- Heads up!
Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.
@@ -541,7 +541,6 @@ For example, <code><section></code> should be wrapped as inlin
<p>Sample text here...</p>
</pre>
- Heads up! Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.
@@ -1781,7 +1780,6 @@ For example, <code><section></code> should be wrapped as inlin
<a href="#" class="btn btn-large disabled">Link</a>
- Heads up!
We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. Also, this class is only for aesthetic; you must use custom JavaScript to disable links here.
@@ -1824,7 +1822,7 @@ For example, <code><section></code> should be wrapped as inlin
Images
- Add classes to an <img> element to easily style images in any project.
+ Add classes to an <img> element to easily style images in any project. Rounded corners are not available in IE8.
![]()
![]()
@@ -1835,8 +1833,6 @@ For example, <code><section></code> should be wrapped as inlin
<img src="..." class="img-circle">
<img src="..." class="img-polaroid">
-
Heads up! .img-rounded and .img-circle do not work in IE8 due to lack of border-radius support.
-
@@ -2034,10 +2030,7 @@ For example, <code><section></code> should be wrapped as inlin
<i class="glyphicon-search"></i>
Want to change the icon color? Just change the color of the parent element.
-
- Heads up!
- When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.
-
+
When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.