diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 176238fc66..0a45b94a39 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 14:44:00 PST 2012
+ * Date: Fri Jan 27 14:44:44 PST 2012
*/
article,
aside,
@@ -1076,8 +1076,8 @@ table .span12 {
margin-left: 0;
}
.icon {
- background-image: url(../img/glyphicons-halflings-sprite.png);
- background-position: 0 0;
+ background-image: url(../img/glyphicons-halflings.png);
+ background-position: 14px 14px;
background-repeat: no-repeat;
display: inline-block;
vertical-align: text-top;
@@ -1085,7 +1085,7 @@ table .span12 {
height: 14px;
}
.icon.white {
- background-image: url(../img/glyphicons-halflings-sprite-white.png);
+ background-image: url(../img/glyphicons-halflings-white.png);
}
.icon.glass {
background-position: 0 0;
@@ -1180,7 +1180,7 @@ table .span12 {
.icon.refresh {
background-position: -240px -24px;
}
-.icon.calendar {
+.icon.list-alt {
background-position: -264px -24px;
}
.icon.lock {
@@ -1211,7 +1211,7 @@ table .span12 {
background-position: 0 -48px;
}
.icon.tags {
- background-position: -24px -48px;
+ background-position: -25px -48px;
}
.icon.book {
background-position: -48px -48px;
@@ -1229,7 +1229,7 @@ table .span12 {
background-position: -144px -48px;
}
.icon.bold {
- background-position: -168px -48px;
+ background-position: -167px -48px;
}
.icon.italic {
background-position: -192px -48px;
@@ -1327,6 +1327,36 @@ table .span12 {
.icon.chevron-right {
background-position: -456px -72px;
}
+.icon.plus-sign {
+ background-position: 0 -96px;
+}
+.icon.minus-sign {
+ background-position: -24px -96px;
+}
+.icon.remove-sign {
+ background-position: -48px -96px;
+}
+.icon.ok-sign {
+ background-position: -72px -96px;
+}
+.icon.question-sign {
+ background-position: -96px -96px;
+}
+.icon.info-sign {
+ background-position: -120px -96px;
+}
+.icon.screenshot {
+ background-position: -144px -96px;
+}
+.icon.remove-circle {
+ background-position: -168px -96px;
+}
+.icon.ok-circle {
+ background-position: -192px -96px;
+}
+.icon.ban-circle {
+ background-position: -216px -96px;
+}
.icon.arrow-left {
background-position: -240px -96px;
}
@@ -1334,7 +1364,7 @@ table .span12 {
background-position: -264px -96px;
}
.icon.arrow-up {
- background-position: -288px -96px;
+ background-position: -289px -96px;
}
.icon.arrow-down {
background-position: -312px -96px;
@@ -1352,11 +1382,71 @@ table .span12 {
background-position: -408px -96px;
}
.icon.minus {
- background-position: -432px -96px;
+ background-position: -433px -96px;
}
.icon.asterisk {
background-position: -456px -96px;
}
+.icon.exclamation-sign {
+ background-position: 0 -120px;
+}
+.icon.gift {
+ background-position: -24px -120px;
+}
+.icon.leaf {
+ background-position: -48px -120px;
+}
+.icon.fire {
+ background-position: -72px -120px;
+}
+.icon.eye-open {
+ background-position: -96px -120px;
+}
+.icon.eye-close {
+ background-position: -120px -120px;
+}
+.icon.warning-sign {
+ background-position: -144px -120px;
+}
+.icon.plane {
+ background-position: -168px -120px;
+}
+.icon.calendar {
+ background-position: -192px -120px;
+}
+.icon.random {
+ background-position: -216px -120px;
+}
+.icon.comment {
+ background-position: -240px -120px;
+}
+.icon.magnet {
+ background-position: -264px -120px;
+}
+.icon.chevron-up {
+ background-position: -288px -120px;
+}
+.icon.chevron-down {
+ background-position: -313px -119px;
+}
+.icon.retweet {
+ background-position: -336px -120px;
+}
+.icon.shopping-cart {
+ background-position: -360px -120px;
+}
+.icon.folder-close {
+ background-position: -384px -120px;
+}
+.icon.folder-open {
+ background-position: -408px -120px;
+}
+.icon.resize-vertical {
+ background-position: -432px -119px;
+}
+.icon.resize-horizontal {
+ background-position: -456px -118px;
+}
.dropdown {
position: relative;
}
@@ -1811,6 +1901,7 @@ table .span12 {
}
.navbar-form input, .navbar-form select {
display: inline-block;
+ margin-top: 5px;
margin-bottom: 0;
}
.navbar-search {
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
deleted file mode 100644
index a92b1913a2..0000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite-white.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
deleted file mode 100644
index b4e0acfbc1..0000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000..a20760bfde
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-white.png differ
diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png
new file mode 100644
index 0000000000..92d4445dfd
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings.png differ
diff --git a/docs/assets/img/grid-18px.png b/docs/assets/img/grid-18px.png
deleted file mode 100644
index b2f88799b8..0000000000
Binary files a/docs/assets/img/grid-18px.png and /dev/null differ
diff --git a/docs/base-css.html b/docs/base-css.html
index cd06c6118e..698b68ea19 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1338,10 +1338,6 @@
-
+
+
-
-
+
+
-
-
+
+
- Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.
+ Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
<i class="icon search"></i>
- There are over 100 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
+ There are also styles available for inverted (white) icons, made ready with one extra class:
+
+<i class="icon white search"></i>
+
+ There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
Use cases
@@ -1458,11 +1492,12 @@
Examples
-
+
Or, use them in navigation.
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c3d10eb081..f6504a249a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1273,10 +1273,6 @@
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
- {{_i}}Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.{{/i}}
+ {{_i}}Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.{{/i}}
@@ -1376,7 +1406,11 @@
<i class="icon search"></i>
-
{{_i}}There are over 100 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
+
There are also styles available for inverted (white) icons, made ready with one extra class:
+
+<i class="icon white search"></i>
+
+
{{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
{{_i}}Use cases{{/i}}
@@ -1393,11 +1427,12 @@
{{_i}}Examples{{/i}}
-
+
{{_i}}Or, use them in navigation.{{/i}}
diff --git a/examples/container-app.html b/examples/container-app.html
index 9bf651753a..df0e8dba48 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -12,7 +12,7 @@
-
+