buttons and icons updated for improved placement and variable support for icon paths

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ae23a7c9816225d0d3f6f0ada6e172ca9e552083..1ebcf34ce36535366247c61ed44098265d32b510 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7d28ab36d948aa988ca9183d689e564c844178ef..459e207b7784daf32c2c0ed2561dafd6ec29c27b 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1122,8 +1122,9 @@ table .span12 {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url("../img/glyphicons-halflings.png");
   background-position: 14px 14px;
   background-repeat: no-repeat;
   *margin-right: .3em;
@@ -1132,7 +1133,7 @@ table .span12 {
   *margin-left: 0;
 }
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url("../img/glyphicons-halflings-white.png");
 }
 .icon-glass {
   background-position: 0      0;
@@ -1733,7 +1734,7 @@ table .span12 {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.btn-large .icon {
+.btn-large [class^="icon-"] {
   margin-top: 1px;
 }
 .btn-small {
@@ -1741,7 +1742,7 @@ table .span12 {
   font-size: 11px;
   line-height: 16px;
 }
-.btn-small .icon {
+.btn-small [class^="icon-"] {
   margin-top: -1px;
 }
 .btn-primary,

diff --git a/less/buttons.less b/less/buttons.less
index 582350386e5ff61746c8dd8cbcd2afa04f31ad50..61d0bc7bf876b91b0c8a3faba30a5d541cb2d2e0 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -76,7 +76,7 @@
   line-height: normal;
   .border-radius(5px);
 }
-.btn-large .icon {
+.btn-large [class^="icon-"] {
   margin-top: 1px;
 }
 
@@ -86,7 +86,7 @@
   font-size: @baseFontSize - 2px;
   line-height: @baseLineHeight - 2px;
 }
-.btn-small .icon {
+.btn-small [class^="icon-"] {
   margin-top: -1px;
 }
 

diff --git a/less/sprites.less b/less/sprites.less
index 921c662d700f204e8251ab8487b9d994229a002f..ce76688443935ad44d0b1c27f482edaa23188068 100644 (file)
--- 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; }

diff --git a/less/variables.less b/less/variables.less
index f01c232e4a8b9ec0d7c48e3c32d35ac04090f489..9f58d730ee627d013f37939fcc3c12832fc4a040 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -47,15 +47,19 @@
 // Z-index master list
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-@zindexDropdown:        1000;
-@zindexPopover:         1010;
-@zindexTooltip:         1020;
-@zindexFixedNavbar:     1030;
-@zindexModalBackdrop:   1040;
-@zindexModal:           1050;
+@zindexDropdown:          1000;
+@zindexPopover:           1010;
+@zindexTooltip:           1020;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+
+// Sprite icons path
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
 
 // Input placeholder text color
-@placeholderText:       @grayLight;
+@placeholderText:         @grayLight;
 
 // Navbar
 @navbarHeight:                    40px;