remove sprites vars, change zindex vars

diff --git a/docs/customize.html b/docs/customize.html
index 277d9701a2b9722dd290bf6ad4600d8e7187bad0..4955471a1c0473a9f03c03471fca525b60aa56c2 100644 (file)
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -248,12 +248,6 @@
                 <label>@link-color-hover</label>
                 <input type="text" class="span3" placeholder="darken(@link-color, 15%)">
 
-                <h3>Sprites</h3>
-                <label>@iconSpritePath</label>
-                <input type="text" class="span3" placeholder="'../img/glyphicons-halflings.png'">
-                <label>@iconWhiteSpritePath</label>
-                <input type="text" class="span3" placeholder="'../img/glyphicons-halflings-white.png'">
-
                 <h3>Grid system</h3>
                 <label>@gridColumns</label>
                 <input type="text" class="span3" placeholder="12">

diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index b918486760e0f3d5e86e7892112c82405c329d95..e05502f5b2e4f596bed21df9712457b69e7310bd 100644 (file)
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -180,12 +180,6 @@
                 <label>@link-color-hover</label>
                 <input type="text" class="span3" placeholder="darken(@link-color, 15%)">
 
-                <h3>{{_i}}Sprites{{/i}}</h3>
-                <label>@iconSpritePath</label>
-                <input type="text" class="span3" placeholder="'../img/glyphicons-halflings.png'">
-                <label>@iconWhiteSpritePath</label>
-                <input type="text" class="span3" placeholder="'../img/glyphicons-halflings-white.png'">
-
                 <h3>{{_i}}Grid system{{/i}}</h3>
                 <label>@gridColumns</label>
                 <input type="text" class="span3" placeholder="12">

diff --git a/less/dropdowns.less b/less/dropdowns.less
index bf0559c481071854cee502972939d6bf3cd9bb37..922baf02ddeb22d3e78b0d66ba91463e3f112e33 100644 (file)
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -38,7 +38,7 @@
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: @zindexDropdown;
+  z-index: @zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: 160px;

diff --git a/less/modals.less b/less/modals.less
index 86be20de6926de5b7c67bd761db1e29be638bc21..b1f57d7a1a90045b1750802fc24c42609cc3f401 100644 (file)
--- a/less/modals.less
+++ b/less/modals.less
@@ -9,7 +9,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: @zindexModalBackdrop;
+  z-index: @zindex-modal-background;
   background-color: @black;
   // Fade for backdrop
   &.fade { opacity: 0; }
@@ -25,7 +25,7 @@
   position: fixed;
   top: 10%;
   left: 50%;
-  z-index: @zindexModal;
+  z-index: @zindex-modal;
   width: 560px;
   margin-left: -280px;
   background-color: #fff;

diff --git a/less/navbar.less b/less/navbar.less
index a38f1cd3cf19d584844b7dee85252c7007e3d1c8..01932049bc8768be0c457c0828c94dfbcdfdea82 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -157,7 +157,7 @@
   position: fixed;
   right: 0;
   left: 0;
-  z-index: @zindexFixedNavbar;
+  z-index: @zindex-navbar-fixed;
   margin-bottom: 0; // remove 18px margin for default navbar
   border-width: 0 0 1px;
   padding-left:  0;

diff --git a/less/popovers.less b/less/popovers.less
index 095b81bf13fa415baed8f61637c38712b43bedc5..fff10f3837011f45729e2c0c2a21f262d1a56761 100644 (file)
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -7,7 +7,7 @@
   position: absolute;
   top: 0;
   left: 0;
-  z-index: @zindexPopover;
+  z-index: @zindex-popover;
   display: none;
   width: 236px;
   padding: 1px;

diff --git a/less/tooltip.less b/less/tooltip.less
index 5fdaa80eff727a7f2467670c41e4d001f407551e..49e553643acc8d2e52d529794b6851839927f185 100644 (file)
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -6,7 +6,7 @@
 // Base class
 .tooltip {
   position: absolute;
-  z-index: @zindexTooltip;
+  z-index: @zindex-tooltip;
   display: block;
   visibility: visible;
   padding: 5px;

diff --git a/less/variables.less b/less/variables.less
index 5194a67da17c34237be02c85d228dd8086b0a215..dcdecd125a86a439892a379137ffb9fb161806ec 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -138,19 +138,12 @@
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-@zindexDropdown:          1000;
-@zindexPopover:           1010;
-@zindexTooltip:           1030;
-@zindexFixedNavbar:       1030;
-@zindexModalBackdrop:     1040;
-@zindexModal:             1050;
-
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath:          "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
-
+@zindex-dropdown:          1000;
+@zindex-popover:           1010;
+@zindex-tooltip:           1030;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
 
 // Input placeholder text color
 // -------------------------