Fixes #7617: lowercase and dash gray color vars

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f40720bf4a7373199b84cf1ad2468f9946976e3d..624daf46cd520d1bf480607941b8688a7f9d6d08 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3471,8 +3471,8 @@ button.close {
 .nav-pills .open .dropdown-toggle,
 .nav > li.dropdown.open.active > a:hover {
   color: #fff;
-  background-color: @grayLight;
-  border-color: @grayLight;
+  background-color: @gray-light;
+  border-color: @gray-light;
 }
 .nav li.dropdown.open .caret,
 .nav li.dropdown.open.active .caret,
@@ -3484,7 +3484,7 @@ button.close {
 
 // Dropdowns in stacked tabs
 .tabs-stacked .open > a:hover {
-  border-color: @grayLight;
+  border-color: @gray-light;
 }
 
 */

diff --git a/less/badges.less b/less/badges.less
index 9cbb0f23a0d4f667be7e491ef986356f03c8a549..4281550f0d4f10265b082b6322bfd0b1aa1cd5a4 100644 (file)
--- a/less/badges.less
+++ b/less/badges.less
@@ -15,7 +15,7 @@
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: @grayLight;
+  background-color: @gray-light;
   border-radius: 10px;
 
   // Empty labels/badges collapse

diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index 9d8f23af2f1d292803802678e02bff807cdc701f..feb4f771d49cebd58157d932f30e4ac6e0b59b77 100644 (file)
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -23,6 +23,6 @@
     }
   }
   > .active {
-    color: @grayLight;
+    color: @gray-light;
   }
 }

diff --git a/less/buttons.less b/less/buttons.less
index a412bd5ff561e80fae79dae62a57350847dc216d..b65e3fdc7ef5a8ae15060319774d9a378d6b5fc0 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -168,7 +168,7 @@ fieldset[disabled] .btn-link {
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: @grayDark;
+      color: @gray-dark;
       text-decoration: none;
     }
   }

diff --git a/less/code.less b/less/code.less
index c55f32fe7e90c3cb643b4551289b455e59ea0e74..d9ddbc3a448e446a453fb4abe1a6474ef31a6e4f 100644 (file)
--- a/less/code.less
+++ b/less/code.less
@@ -9,7 +9,7 @@ pre {
   padding: 0 3px 2px;
   font-family: @font-family-monospace;
   font-size: (@font-size-base - 2);
-  color: @grayDark;
+  color: @gray-dark;
   border-radius: 4px;
 }
 

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 7f9f776035aa08b425d865178832053923afccdc..c4fd8598bb5d0bd405fdfd2164c3317d365afb56 100644 (file)
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -103,7 +103,7 @@
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
-  color: @grayLight;
+  color: @gray-light;
 }
 // Nuke hover/focus effects
 .dropdown-menu > .disabled > a:hover,

diff --git a/less/forms.less b/less/forms.less
index 8ef99d0e257a5cfd08593a69c710f71ed895eb75..e0017fac7fe7a5df9f3ede6f0b74d6f40283a093 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -23,7 +23,7 @@ legend {
   margin-bottom: @line-height-base;
   font-size: (@font-size-base * 1.5);
   line-height: (@line-height-base * 2);
-  color: @grayDark;
+  color: @gray-dark;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
 }
@@ -426,7 +426,7 @@ select:focus:invalid {
   line-height: @line-height-base;
   text-align: center;
   text-shadow: 0 1px 0 #fff;
-  background-color: @grayLighter;
+  background-color: @gray-lighter;
   border: 1px solid #ccc;
 
        &.input-small {

diff --git a/less/labels.less b/less/labels.less
index 436fd6acee1315d195cc559d88e5a39216f294b0..e01054fdf4b191e23bf674f803d4b55c7399cfbf 100644 (file)
--- a/less/labels.less
+++ b/less/labels.less
@@ -13,7 +13,7 @@
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: @grayLight;
+  background-color: @gray-light;
   border-radius: .25em;
 }
 

diff --git a/less/navs.less b/less/navs.less
index 5455f510f3e2d79d40e485dbd426679a765b02e9..86e9caaf9f10216c90671e5dbcdae212dd932745 100644 (file)
--- a/less/navs.less
+++ b/less/navs.less
@@ -21,7 +21,7 @@
       &:hover,
       &:focus {
         text-decoration: none;
-        background-color: @grayLighter;        
+        background-color: @gray-lighter;
       }
     }
 
@@ -33,12 +33,12 @@
 
     // Gray out text
     &.disabled > a {
-      color: @grayLight;
+      color: @gray-light;
     }
     // Nuke hover effects
     &.disabled > a:hover,
     &.disabled > a:focus {
-      color: @grayLight;
+      color: @gray-light;
       text-decoration: none;
       background-color: transparent;
       cursor: default;
@@ -54,7 +54,7 @@
   > .pull-right {
     float: right;
   }
-  
+
   // Dividers (basically an hr) within the dropdown
   .divider {
     .nav-divider();
@@ -75,7 +75,7 @@
   > li {
     float: left;
     // Make the list-items overlay the bottom border
-    margin-bottom: -1px;    
+    margin-bottom: -1px;
 
     // Actual tabs (as links)
     > a {
@@ -84,7 +84,7 @@
       border: 1px solid transparent;
       border-radius: @border-radius-base @border-radius-base 0 0;
       &:hover {
-        border-color: @grayLighter @grayLighter #ddd;
+        border-color: @gray-lighter @gray-lighter #ddd;
       }
     }
 
@@ -96,7 +96,7 @@
       background-color: @body-bg;
       border: 1px solid #ddd;
       border-bottom-color: transparent;
-      cursor: default;      
+      cursor: default;
     }
   }
   // pulling this in mainly for less shorthand
@@ -128,7 +128,7 @@
     &.active > a:hover,
     &.active > a:focus {
       color: #fff;
-      background-color: @component-active-bg;      
+      background-color: @component-active-bg;
     }
   }
 }
@@ -141,7 +141,7 @@
     + li {
       > a {
         margin-top: 2px;
-        margin-left: 0; // no need for this gap between nav items        
+        margin-left: 0; // no need for this gap between nav items
       }
     }
   }
@@ -186,7 +186,7 @@
   font-size: 11px;
   font-weight: bold;
   line-height: @line-height-base;
-  color: @grayLight;
+  color: @gray-light;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
   text-transform: uppercase;
 }
@@ -264,8 +264,8 @@
 .nav-pills .open .dropdown-toggle,
 .nav > li.dropdown.open.active > a:hover {
   color: #fff;
-  background-color: @grayLight;
-  border-color: @grayLight;
+  background-color: @gray-light;
+  border-color: @gray-light;
 }
 .nav li.dropdown.open .caret,
 .nav li.dropdown.open.active .caret,
@@ -277,7 +277,7 @@
 
 // Dropdowns in stacked tabs
 .tabs-stacked .open > a:hover {
-  border-color: @grayLight;
+  border-color: @gray-light;
 }
 
 */

diff --git a/less/pager.less b/less/pager.less
index 105880086aee60ee829d83d7dd31d7fbd1ab4883..cc1947a91fcfadae656462489ebb34b18186e394 100644 (file)
--- a/less/pager.less
+++ b/less/pager.less
@@ -32,7 +32,7 @@
       float: right;
     }
   }
-  
+
   .previous {
     > a,
     > span {
@@ -45,7 +45,7 @@
     > a:hover,
     > a:focus,
     > span {
-      color: @grayLight;
+      color: @gray-light;
       background-color: @pagination-bg;
       cursor: default;
     }

diff --git a/less/pagination.less b/less/pagination.less
index c2158cef0bd0d841e978d82b1bae399fb2fd4095..bb44fa8cf9aca6fd84b08d5eb476de942a2d1f1d 100644 (file)
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -27,14 +27,14 @@
 }
 .pagination > .active > a,
 .pagination > .active > span {
-  color: @grayLight;
+  color: @gray-light;
   cursor: default;
 }
 .pagination > .disabled > span,
 .pagination > .disabled > a,
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
-  color: @grayLight;
+  color: @gray-light;
   background-color: @pagination-bg;
   cursor: default;
 }

diff --git a/less/type.less b/less/type.less
index 1235b393189d0dee9ee9f930716ca8463c90217c..f6b5eecd58de792b675ca7eda9e8addfacaf2c64 100644 (file)
--- a/less/type.less
+++ b/less/type.less
@@ -28,9 +28,9 @@ em      { font-style: italic; }
 cite    { font-style: normal; }
 
 // Utility classes
-.text-muted          { color: @grayLight; }
+.text-muted          { color: @gray-light; }
 a.text-muted:hover,
-a.text-muted:focus   { color: darken(@grayLight, 10%); }
+a.text-muted:focus   { color: darken(@gray-light, 10%); }
 
 .text-warning        { color: @state-warning-text; }
 a.text-warning:hover,
@@ -60,7 +60,7 @@ h1, h2, h3, h4, h5, h6,
   small {
     font-weight: normal;
     line-height: 1;
-    color: @grayLight;
+    color: @gray-light;
   }
 }
 
@@ -100,7 +100,7 @@ h4 small, .h4 small { font-size: @font-size-base; }
 .page-header {
   padding-bottom: ((@line-height-base / 2) - 1);
   margin: (@line-height-base * 2) 0 @line-height-base;
-  border-bottom: 1px solid @grayLighter;
+  border-bottom: 1px solid @gray-lighter;
 }
 
 
@@ -187,7 +187,7 @@ abbr[title],
 // Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted @grayLight;
+  border-bottom: 1px dotted @gray-light;
 }
 abbr.initialism {
   font-size: 90%;
@@ -198,7 +198,7 @@ abbr.initialism {
 blockquote {
   padding: (@line-height-base/2) @line-height-base;
   margin: 0 0 @line-height-base;
-  border-left: 5px solid @grayLighter;
+  border-left: 5px solid @gray-lighter;
   p {
     font-size: (@font-size-base * 1.25);
     font-weight: 300;
@@ -210,7 +210,7 @@ blockquote {
   small {
     display: block;
     line-height: @line-height-base;
-    color: @grayLight;
+    color: @gray-light;
     &:before {
       content: '\2014 \00A0';
     }
@@ -221,7 +221,7 @@ blockquote {
     float: right;
     padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid @grayLighter;
+    border-right: 5px solid @gray-lighter;
     border-left: 0;
     p,
     small {

diff --git a/less/variables.less b/less/variables.less
index 59e91a0d20d581d2e878c8c932e509729f1d4608..1c19fd514339d8b099700a6d57145b2ae30962ed 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -10,11 +10,11 @@
 // Grays
 // -------------------------
 
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
+@gray-darker:            lighten(#000, 13.5%); // #222
+@gray-dark:              lighten(#000, 20%);   // #333
+@gray:                   lighten(#000, 33.5%); // #555
+@gray-light:             lighten(#000, 60%);   // #999
+@gray-lighter:           lighten(#000, 93.5%); // #eee
 
 // Brand colors
 // -------------------------
@@ -29,7 +29,7 @@
 // -------------------------
 
 @body-bg:               #fff;
-@text-color:            @grayDark;
+@text-color:            @gray-dark;
 
 // Links
 // -------------------------
@@ -109,12 +109,12 @@
 // -------------------------
 
 @input-bg:                       #fff;
-@input-bg-disabled:              @grayLighter;
+@input-bg-disabled:              @gray-lighter;
 
 @input-border:                   #ccc;
 @input-border-radius:            @border-radius-base;
 
-@input-color-placeholder:        @grayLight;
+@input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-base + 14px); // base line-height + 12px vertical padding + 2px top/bottom border
 @input-height-large:             (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border
@@ -134,7 +134,7 @@
 @dropdown-link-active-color:     #fff;
 @dropdown-link-active-bg:        @component-active-bg;
 
-@dropdown-link-color:            @grayDark;
+@dropdown-link-color:            @gray-dark;
 @dropdown-link-hover-color:      #fff;
 @dropdown-link-hover-bg:         @dropdown-link-active-bg;
 
@@ -184,11 +184,11 @@
 @navbar-brand-hover-bg:            transparent;
 
 // Inverted navbar
-@navbar-inverse-text:                       @grayLight;
+@navbar-inverse-text:                       @gray-light;
 @navbar-inverse-bg:                         #222;
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 @grayLight;
+@navbar-inverse-link-color:                 @gray-light;
 @navbar-inverse-link-hover-color:           #fff;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
@@ -220,7 +220,7 @@
 // Jumbotron
 // -------------------------
 
-@jumbotron-bg:                   @grayLighter;
+@jumbotron-bg:                   @gray-lighter;
 @jumbotron-heading-color:        inherit;
 @jumbotron-lead-color:           inherit;
 
@@ -363,7 +363,7 @@
 // -------------------------
 
 // Hr border color
-@hr-border:                   @grayLighter;
+@hr-border:                   @gray-lighter;
 
 // Horizontal forms & lists
 @component-offset-horizontal: 180px;