aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-26 16:27:37 -0800
committerMark Otto <[email protected]>2012-01-26 16:27:37 -0800
commitaf96da6e895974dd4bd6fb19cf0c6d7e16bf050d (patch)
tree432e353d769cb0be4a95056076e108de2b5a71ae
parentb260544de02788bc921c4c713df0f754d96c5a27 (diff)
downloadbootstrap-af96da6e895974dd4bd6fb19cf0c6d7e16bf050d.tar.xz
bootstrap-af96da6e895974dd4bd6fb19cf0c6d7e16bf050d.zip
adding white sprites
-rw-r--r--bootstrap.css5
-rw-r--r--bootstrap.min.css1
-rw-r--r--docs/assets/img/glyphicons-halflings-sprite-white.pngbin0 -> 13566 bytes
-rw-r--r--docs/assets/img/glyphicons-halflings-sprite.pngbin5249 -> 14152 bytes
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/templates/pages/base-css.mustache2
-rw-r--r--lib/sprites.less3
7 files changed, 10 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css
index cc5d7f019..cadc4d243 100644
--- a/bootstrap.css
+++ b/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: Thu Jan 26 15:39:24 PST 2012
+ * Date: Thu Jan 26 16:26:33 PST 2012
*/
article,
aside,
@@ -1074,6 +1074,9 @@ table .span12 {
width: 14px;
height: 14px;
}
+.icon.white {
+ background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
.glass {
background-position: 0 0;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1e41bf911..cf78031f2 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -208,6 +208,7 @@ table .span10{float:none;width:764px;margin-left:0;}
table .span11{float:none;width:844px;margin-left:0;}
table .span12{float:none;width:924px;margin-left:0;}
.icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
+.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
.glass{background-position:0 0;}
.music{background-position:-24px 0;}
.search{background-position:-48px 0;}
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
--- /dev/null
+++ b/docs/assets/img/glyphicons-halflings-sprite-white.png
Binary files differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
index 2d783eefe..b4e0acfbc 100644
--- a/docs/assets/img/glyphicons-halflings-sprite.png
+++ b/docs/assets/img/glyphicons-halflings-sprite.png
Binary files differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 239b963c4..a30e0c1f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1482,7 +1482,7 @@
<p>Or, use them in navigation.</p>
<div class="well" style="padding: 8px 0;">
<ul class="nav list">
- <li class="active"><a href="#"><i class="icon home"></i> Home</a></li>
+ <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li>
<li><a href="#"><i class="icon book"></i> Library</a></li>
<li><a href="#"><i class="icon pencil"></i> Applications</a></li>
</ul>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 6f928dfa3..c3d10eb08 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1417,7 +1417,7 @@
<p>{{_i}}Or, use them in navigation.{{/i}}</p>
<div class="well" style="padding: 8px 0;">
<ul class="nav list">
- <li class="active"><a href="#"><i class="icon home"></i> {{_i}}Home{{/i}}</a></li>
+ <li class="active"><a href="#"><i class="icon white home"></i> {{_i}}Home{{/i}}</a></li>
<li><a href="#"><i class="icon book"></i> {{_i}}Library{{/i}}</a></li>
<li><a href="#"><i class="icon pencil"></i> {{_i}}Applications{{/i}}</a></li>
</ul>
diff --git a/lib/sprites.less b/lib/sprites.less
index 0d51125c2..c85d63e8f 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -20,6 +20,9 @@
width: 14px;
height: 14px;
}
+.icon.white {
+ background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
.glass { background-position: 0 0; }
.music { background-position: -24px 0; }