remove sprites vars, change zindex vars

8 files changed, 12 insertions, 31 deletions

diff --git a/docs/customize.html b/docs/customize.html
index 277d9701a..4955471a1 100644
--- 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 b91848676..e05502f5b 100644
--- 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 bf0559c48..922baf02d 100644
--- 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 86be20de6..b1f57d7a1 100644
--- 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 a38f1cd3c..01932049b 100644
--- 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 095b81bf1..fff10f383 100644
--- 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 5fdaa80ef..49e553643 100644
--- 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 5194a67da..dcdecd125 100644
--- 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
 // -------------------------