diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 495188af7faca02cfd553ebb7c809ee469cf1a8b..b209481a62d9a24e98f0fd37d5ef9d890ea81d81 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1767,6 +1767,66 @@ table .span24 {
.icon-resize-horizontal {
background-position: -456px -118px;
}
+.icon-hdd {
+ background-position: 0 -144px;
+}
+.icon-announcement {
+ background-position: -24px -144px;
+}
+.icon-bell {
+ background-position: -48px -144px;
+}
+.icon-certificate {
+ background-position: -72px -144px;
+}
+.icon-thumbs-up {
+ background-position: -96px -144px;
+}
+.icon-thumbs-down {
+ background-position: -120px -144px;
+}
+.icon-hand-right {
+ background-position: -144px -144px;
+}
+.icon-hand-left {
+ background-position: -168px -144px;
+}
+.icon-hand-up {
+ background-position: -192px -144px;
+}
+.icon-hand-down {
+ background-position: -216px -144px;
+}
+.icon-circle-arrow-right {
+ background-position: -240px -144px;
+}
+.icon-circle-arrow-left {
+ background-position: -264px -144px;
+}
+.icon-circle-arrow-up {
+ background-position: -288px -144px;
+}
+.icon-circle-arrow-down {
+ background-position: -312px -144px;
+}
+.icon-globe {
+ background-position: -336px -144px;
+}
+.icon-wrench {
+ background-position: -360px -144px;
+}
+.icon-tasks-progress {
+ background-position: -384px -144px;
+}
+.icon-filter {
+ background-position: -408px -144px;
+}
+.icon-briefcase {
+ background-position: -432px -144px;
+}
+.icon-fullscreen {
+ background-position: -456px -144px;
+}
.dropdown {
position: relative;
}
diff --git a/docs/assets/img/glyphicons-halflings-grey.png b/docs/assets/img/glyphicons-halflings-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd873be89fa58a02048c3acfa4a8d791312825a7
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-grey.png differ
diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png
index a20760bfde58d1c92cee95116059fba03c68d689..ba731534e090571a4e5f5d72221bbafbf48f8c43 100644
Binary files a/docs/assets/img/glyphicons-halflings-white.png 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
index 92d4445dfd0af414835467132cf50c7c38a303af..b40edfd76c79decf2904f14a98586b2142d555db 100644
Binary files a/docs/assets/img/glyphicons-halflings.png and b/docs/assets/img/glyphicons-halflings.png differ
diff --git a/docs/base-css.html b/docs/base-css.html
index d44b658913bb3874d068ddbcb8b4d769a2378c47..2b4e58a53345e3000ddfe8b6252113b1a94dcb6e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1445,15 +1445,15 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-inbox"></i> icon-inbox</li>
<li><i class="icon-play-circle"></i> icon-play-circle</li>
<li><i class="icon-repeat"></i> icon-repeat</li>
- </ul>
- </div>
- <div class="span3">
- <ul class="the-icons">
<li><i class="icon-refresh"></i> icon-refresh</li>
<li><i class="icon-list-alt"></i> icon-list-alt</li>
<li><i class="icon-lock"></i> icon-lock</li>
<li><i class="icon-flag"></i> icon-flag</li>
<li><i class="icon-headphones"></i> icon-headphones</li>
+ </ul>
+ </div>
+ <div class="span3">
+ <ul class="the-icons">
<li><i class="icon-volume-off"></i> icon-volume-off</li>
<li><i class="icon-volume-down"></i> icon-volume-down</li>
<li><i class="icon-volume-up"></i> icon-volume-up</li>
@@ -1479,10 +1479,6 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-indent-right"></i> icon-indent-right</li>
<li><i class="icon-facetime-video"></i> icon-facetime-video</li>
<li><i class="icon-picture"></i> icon-picture</li>
- </ul>
- </div>
- <div class="span3">
- <ul class="the-icons">
<li><i class="icon-pencil"></i> icon-pencil</li>
<li><i class="icon-map-marker"></i> icon-map-marker</li>
<li><i class="icon-adjust"></i> icon-adjust</li>
@@ -1493,6 +1489,10 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-move"></i> icon-move</li>
<li><i class="icon-step-backward"></i> icon-step-backward</li>
<li><i class="icon-fast-backward"></i> icon-fast-backward</li>
+ </ul>
+ </div>
+ <div class="span3">
+ <ul class="the-icons">
<li><i class="icon-backward"></i> icon-backward</li>
<li><i class="icon-play"></i> icon-play</li>
<li><i class="icon-pause"></i> icon-pause</li>
@@ -1513,10 +1513,6 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-remove-circle"></i> icon-remove-circle</li>
<li><i class="icon-ok-circle"></i> icon-ok-circle</li>
<li><i class="icon-ban-circle"></i> icon-ban-circle</li>
- </ul>
- </div>
- <div class="span3">
- <ul class="the-icons">
<li><i class="icon-arrow-left"></i> icon-arrow-left</li>
<li><i class="icon-arrow-right"></i> icon-arrow-right</li>
<li><i class="icon-arrow-up"></i> icon-arrow-up</li>
@@ -1532,6 +1528,10 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-leaf"></i> icon-leaf</li>
<li><i class="icon-fire"></i> icon-fire</li>
<li><i class="icon-eye-open"></i> icon-eye-open</li>
+ </ul>
+ </div>
+ <div class="span3">
+ <ul class="the-icons">
<li><i class="icon-eye-close"></i> icon-eye-close</li>
<li><i class="icon-warning-sign"></i> icon-warning-sign</li>
<li><i class="icon-plane"></i> icon-plane</li>
@@ -1547,6 +1547,26 @@ For example, <code>section</code> should be wrapped as inline.
<li><i class="icon-folder-open"></i> icon-folder-open</li>
<li><i class="icon-resize-vertical"></i> icon-resize-vertical</li>
<li><i class="icon-resize-horizontal"></i> icon-resize-horizontal</li>
+ <li><i class="icon-hdd"></i> icon-hdd</li>
+ <li><i class="icon-announcement"></i> icon-announcement</li>
+ <li><i class="icon-bell"></i> icon-bell</li>
+ <li><i class="icon-certificate"></i> icon-certificate</li>
+ <li><i class="icon-thumbs-up"></i> icon-thumbs-up</li>
+ <li><i class="icon-thumbs-down"></i> icon-thumbs-down</li>
+ <li><i class="icon-hand-right"></i> icon-hand-right</li>
+ <li><i class="icon-hand-left"></i> icon-hand-left</li>
+ <li><i class="icon-hand-up"></i> icon-hand-up</li>
+ <li><i class="icon-hand-down"></i> icon-hand-down</li>
+ <li><i class="icon-circle-arrow-right"></i> icon-circle-arrow-right</li>
+ <li><i class="icon-circle-arrow-left"></i> icon-circle-arrow-left</li>
+ <li><i class="icon-circle-arrow-up"></i> icon-circle-arrow-up</li>
+ <li><i class="icon-circle-arrow-down"></i> icon-circle-arrow-down</li>
+ <li><i class="icon-globe"></i> icon-globe</li>
+ <li><i class="icon-wrench"></i> icon-wrench</li>
+ <li><i class="icon-tasks-progress"></i> icon-tasks-progress</li>
+ <li><i class="icon-filter"></i> icon-filter</li>
+ <li><i class="icon-briefcase"></i> icon-briefcase</li>
+ <li><i class="icon-fullscreen"></i> icon-fullscreen</li>
</ul>
</div>
</div>
@@ -1566,9 +1586,10 @@ For example, <code>section</code> should be wrapped as inline.
<pre class="prettyprint linenums">
<i class="icon-search"></i>
</pre>
- <p>There are also styles available for inverted (white) icons, made ready with one extra class:</p>
+ <p>There are also styles available for inverted (white) and shadowed (grey) icons, made ready with one extra class:</p>
<pre class="prettyprint linenums">
<i class="icon-search icon-white"></i>
+<i class="icon-wrench icon-grey"></i>
</pre>
<p>There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
<p>
@@ -1618,7 +1639,7 @@ For example, <code>section</code> should be wrapped as inline.
<a class="btn btn-danger" href="#"><i class="icon-trash icon-white"></i> Delete</a>
</p>
<p>
- <a class="btn btn-large" href="#"><i class="icon-comment"></i> Comment</a>
+ <a class="btn btn-large" href="#"><i class="icon-comment icon-grey"></i> Comment</a>
<a class="btn btn-small" href="#"><i class="icon-cog"></i> Settings</a>
<a class="btn btn-small btn-info" href="#"><i class="icon-info-sign icon-white"></i> More Info</a>
</p>
@@ -1639,7 +1660,7 @@ For example, <code>section</code> should be wrapped as inline.
<label class="control-label" for="inputIcon">Email address</label>
<div class="controls">
<div class="input-prepend">
- <span class="add-on"><i class="icon-envelope"></i></span>
+ <span class="add-on"><i class="icon-envelope icon-grey"></i></span>
<input class="span2" id="inputIcon" type="text">
</div>
</div>
diff --git a/img/glyphicons-halflings-grey.png b/img/glyphicons-halflings-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd873be89fa58a02048c3acfa4a8d791312825a7
Binary files /dev/null and b/img/glyphicons-halflings-grey.png differ
diff --git a/img/glyphicons-halflings-white.png b/img/glyphicons-halflings-white.png
index a20760bfde58d1c92cee95116059fba03c68d689..ba731534e090571a4e5f5d72221bbafbf48f8c43 100644
Binary files a/img/glyphicons-halflings-white.png and b/img/glyphicons-halflings-white.png differ
diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png
index 92d4445dfd0af414835467132cf50c7c38a303af..b40edfd76c79decf2904f14a98586b2142d555db 100644
Binary files a/img/glyphicons-halflings.png and b/img/glyphicons-halflings.png differ
diff --git a/less/sprites.less b/less/sprites.less
index 4014d70a5eb3bcb4540e1e2863fa2395a1c436f1..5f32c454e050c09e792dd018f9bcb40db42de27b 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -30,6 +30,9 @@
.icon-white {
background-image: url("@{iconWhiteSpritePath}");
}
+.icon-grey {
+ background-image: url("@{iconGreySpritePath}");
+}
.icon-glass { background-position: 0 0; }
.icon-music { background-position: -24px 0; }
@@ -149,10 +152,31 @@
.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; } // 1px off
+.icon-chevron-down { background-position: -311px -120px; } // 1px off
.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; }
+
+.icon-hdd { background-position: 0 -144px; }
+.icon-announcement { background-position: -24px -144px; }
+.icon-bell { background-position: -48px -144px; }
+.icon-certificate { background-position: -72px -144px; }
+.icon-thumbs-up { background-position: -96px -144px; }
+.icon-thumbs-down { background-position: -120px -144px; }
+.icon-hand-right { background-position: -144px -144px; }
+.icon-hand-left { background-position: -168px -144px; }
+.icon-hand-up { background-position: -192px -144px; }
+.icon-hand-down { background-position: -216px -144px; }
+.icon-circle-arrow-right { background-position: -240px -144px; }
+.icon-circle-arrow-left { background-position: -264px -144px; }
+.icon-circle-arrow-up { background-position: -288px -144px; }
+.icon-circle-arrow-down { background-position: -312px -144px; }
+.icon-globe { background-position: -336px -144px; }
+.icon-wrench { background-position: -360px -144px; }
+.icon-tasks-progress { background-position: -384px -144px; }
+.icon-filter { background-position: -408px -144px; }
+.icon-briefcase { background-position: -432px -144px; }
+.icon-fullscreen { background-position: -456px -144px; }
diff --git a/less/variables.less b/less/variables.less
index 94c3a0667c1b636ea7cee41c5567b3f617cd0238..c50ab838179fd2abd03106289a8b64fa60fef4e7 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -125,6 +125,7 @@
// -------------------------
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
+@iconGreySpritePath: "../img/glyphicons-halflings-grey.png";
// Input placeholder text color