From 8dd2b3d3f8c84ac242469ae24fe7981b0a916b25 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 1 Feb 2012 23:10:37 -0800
Subject: follow up to #1501 to update notes in sprites.less

---
 less/sprites.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/sprites.less')

diff --git a/less/sprites.less b/less/sprites.less
index a56216c71..921c662d7 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -9,10 +9,10 @@
 // All icons receive the styles of the <i> tag with a base class 
 // of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
-// <i class="i icon-inbox"></i>.
+// <i class="icon-inbox"></i>.
 
 // For the white version of the  icons, just add the .icon-white class:
-// <i class="i icon-inbox icon-white"></i>
+// <i class="icon-inbox icon-white"></i>
 
 [class^="icon-"] {
   display: inline-block;
-- 
cgit v1.2.3


From 7e81f84b29da8ba87fb4aefcc11946002ad9962c Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 4 Feb 2012 22:22:19 -0800
Subject: buttons and icons updated for improved placement and variable support
 for icon paths

---
 less/sprites.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'less/sprites.less')

diff --git a/less/sprites.less b/less/sprites.less
index 921c662d7..ce7668844 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -18,15 +18,16 @@
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url(@iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
   .ie7-restore-right-whitespace();
 }
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url(@iconWhiteSpritePath);
 }
 
 .icon-glass              { background-position: 0      0; }
-- 
cgit v1.2.3


From 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 00:07:05 -0800
Subject: update selectors for icons to include matcher for icon class in
 middle of class attr, remove docs mention of requiring icon-* first

---
 less/sprites.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'less/sprites.less')

diff --git a/less/sprites.less b/less/sprites.less
index ce7668844..a7741661e 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -14,7 +14,8 @@
 // For the white version of the  icons, just add the .icon-white class:
 // <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
-- 
cgit v1.2.3