more vars changed, remove @white var

3 files changed, 53 insertions, 55 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f57c6ff74..12aa52a14 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -607,7 +607,7 @@ hr {
   margin: 20px 0;
   border: 0;
   border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
+  border-bottom: 1px solid #fff;
 }
 
 abbr[title],
@@ -1418,7 +1418,7 @@ select:focus:invalid:focus {
   font-weight: normal;
   line-height: 20px;
   text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
   background-color: #eeeeee;
   border: 1px solid #ccc;
 }
@@ -3301,8 +3301,8 @@ input[type="button"].btn-block {
 .btn-info .caret,
 .btn-success .caret,
 .btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+  border-top-color: #fff;
+  border-bottom-color: #fff;
 }
 
 .btn-group-vertical {
@@ -3495,7 +3495,7 @@ input[type="button"].btn-block {
 
 .nav-pills > .active > a,
 .nav-pills > .active > a:hover {
-  color: #ffffff;
+  color: #fff;
   background-color: #0088cc;
 }
 
@@ -3597,7 +3597,7 @@ input[type="button"].btn-block {
 .nav-tabs .open .dropdown-toggle,
 .nav-pills .open .dropdown-toggle,
 .nav > li.dropdown.open.active > a:hover {
-  color: #ffffff;
+  color: #fff;
   background-color: #999999;
   border-color: #999999;
 }
@@ -3605,8 +3605,8 @@ input[type="button"].btn-block {
 .nav li.dropdown.open .caret,
 .nav li.dropdown.open.active .caret,
 .nav li.dropdown.open a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+  border-top-color: #fff;
+  border-bottom-color: #fff;
   opacity: 1;
   filter: alpha(opacity=100);
 }
@@ -4111,7 +4111,7 @@ input[type="button"].btn-block {
 }
 
 .navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
+  color: #fff;
   background-color: #515151;
   border-color: #111111;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
@@ -4138,7 +4138,7 @@ input[type="button"].btn-block {
 .navbar-inverse .navbar-search .search-query.focused {
   padding: 5px 15px;
   color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
   background-color: #ffffff;
   border: 0;
   outline: 0;
@@ -4186,7 +4186,7 @@ input[type="button"].btn-block {
 
 .breadcrumb li {
   display: inline-block;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
 }
 
 .breadcrumb li:after {
@@ -4419,7 +4419,7 @@ input[type="button"].btn-block {
   z-index: 1050;
   width: 560px;
   margin-left: -280px;
-  background-color: #ffffff;
+  background-color: #fff;
   border: 1px solid #999;
   border: 1px solid rgba(0, 0, 0, 0.3);
   border-radius: 6px;
@@ -4859,7 +4859,7 @@ a.thumbnail:hover {
   font-size: 11.844px;
   font-weight: bold;
   line-height: 14px;
-  color: #ffffff;
+  color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   white-space: nowrap;
   vertical-align: baseline;
@@ -4883,7 +4883,7 @@ a.thumbnail:hover {
 
 a.label:hover,
 a.badge:hover {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
   cursor: pointer;
 }
@@ -5016,7 +5016,7 @@ a.badge:hover {
   width: 0;
   height: 100%;
   font-size: 12px;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #0e90d2;
@@ -5281,7 +5281,7 @@ a.badge:hover {
 }
 
 .carousel-control:hover {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
   opacity: 0.9;
   filter: alpha(opacity=90);
@@ -5318,7 +5318,7 @@ a.badge:hover {
 .carousel-caption h3,
 .carousel-caption p {
   line-height: 20px;
-  color: #ffffff;
+  color: #fff;
 }
 
 .carousel-caption h3 {
diff --git a/docs/customize.html b/docs/customize.html
index ffa219d83..7e1ab8caf 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -238,7 +238,7 @@
               <div class="span3">
                 <h3>Scaffolding</h3>
                 <label>@body-background</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@text-color</label>
                 <input type="text" class="span3" placeholder="@grayDark">
 
@@ -303,8 +303,6 @@
                 <label>@line-height-base</label>
                 <input type="text" class="span3" placeholder="20px">
 
-                <label>@altFontFamily</label>
-                <input type="text" class="span3" placeholder="@font-family-serif">
                 <label>@headings-font-family</label>
                 <input type="text" class="span3" placeholder="inherit">
                 <label>@headings-font-weight</label>
@@ -341,32 +339,32 @@
                 <input type="text" class="span3" placeholder="inherit">
 
                 <h3>Tables</h3>
-                <label>@tableBackground</label>
+                <label>@table-background</label>
                 <input type="text" class="span3" placeholder="transparent">
-                <label>@tableBackgroundAccent</label>
+                <label>@table-background-accent</label>
                 <input type="text" class="span3" placeholder="#f9f9f9">
-                <label>@tableBackgroundHover</label>
+                <label>@table-background-hover</label>
                 <input type="text" class="span3" placeholder="#f5f5f5">
-                <label>@tableBorder</label>
+                <label>@table-border</label>
                 <input type="text" class="span3" placeholder="#ddd">
 
                 <h3>Forms</h3>
                 <label>@placeholderText</label>
                 <input type="text" class="span3" placeholder="@grayLight">
-                <label>@inputBackground</label>
-                <input type="text" class="span3" placeholder="@white">
-                <label>@inputBorder</label>
+                <label>@input-background</label>
+                <input type="text" class="span3" placeholder="#fff">
+                <label>@input-border</label>
                 <input type="text" class="span3" placeholder="#ccc">
-                <label>@inputBorderRadius</label>
+                <label>@input-border-radius</label>
                 <input type="text" class="span3" placeholder="3px">
-                <label>@inputDisabledBackground</label>
+                <label>@input-background-disabled</label>
                 <input type="text" class="span3" placeholder="@grayLighter">
-                <label>@formActionsBackground</label>
+                <label>@form-actions-background</label>
                 <input type="text" class="span3" placeholder="#f5f5f5">
-                <label>@btnPrimaryBackground</label>
+                <label>@btn-backround-primary</label>
                 <input type="text" class="span3" placeholder="@link-color">
-                <label>@btnPrimaryBackgroundHighlight</label>
-                <input type="text" class="span3" placeholder="darken(@white, 10%)">
+                <label>@btn-backround-primary-highlight</label>
+                <input type="text" class="span3" placeholder="darken(#fff, 10%)">
 
               </div><!-- /span -->
               <div class="span3">
@@ -403,7 +401,7 @@
                 <label>@navbarLinkColor</label>
                 <input type="text" class="span3" placeholder="@grayLight">
                 <label>@navbarLinkColorHover</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@navbarLinkColorActive</label>
                 <input type="text" class="span3" placeholder="@navbarLinkColorHover">
                 <label>@navbarLinkBackgroundHover</label>
@@ -413,7 +411,7 @@
                 <label>@navbarSearchBackground</label>
                 <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
                 <label>@navbarSearchBackgroundFocus</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@navbarSearchBorder</label>
                 <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
                 <label>@navbarSearchPlaceholderColor</label>
@@ -426,13 +424,13 @@
 
                 <h3>Dropdowns</h3>
                 <label>@dropdownBackground</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@dropdownBorder</label>
                 <input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
                 <label>@dropdownLinkColor</label>
                 <input type="text" class="span3" placeholder="@grayDark">
                 <label>@dropdownLinkColorHover</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@dropdownLinkBackgroundHover</label>
                 <input type="text" class="span3" placeholder="@link-color">
               </div><!-- /span -->
diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index a927ab97b..f9928f5b9 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -170,7 +170,7 @@
               <div class="span3">
                 <h3>{{_i}}Scaffolding{{/i}}</h3>
                 <label>@body-background</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@text-color</label>
                 <input type="text" class="span3" placeholder="@grayDark">
 
@@ -271,32 +271,32 @@
                 <input type="text" class="span3" placeholder="inherit">
 
                 <h3>{{_i}}Tables{{/i}}</h3>
-                <label>@tableBackground</label>
+                <label>@table-background</label>
                 <input type="text" class="span3" placeholder="transparent">
-                <label>@tableBackgroundAccent</label>
+                <label>@table-background-accent</label>
                 <input type="text" class="span3" placeholder="#f9f9f9">
-                <label>@tableBackgroundHover</label>
+                <label>@table-background-hover</label>
                 <input type="text" class="span3" placeholder="#f5f5f5">
-                <label>@tableBorder</label>
+                <label>@table-border</label>
                 <input type="text" class="span3" placeholder="#ddd">
 
                 <h3>{{_i}}Forms{{/i}}</h3>
                 <label>@placeholderText</label>
                 <input type="text" class="span3" placeholder="@grayLight">
-                <label>@inputBackground</label>
-                <input type="text" class="span3" placeholder="@white">
-                <label>@inputBorder</label>
+                <label>@input-background</label>
+                <input type="text" class="span3" placeholder="#fff">
+                <label>@input-border</label>
                 <input type="text" class="span3" placeholder="#ccc">
-                <label>@inputBorderRadius</label>
+                <label>@input-border-radius</label>
                 <input type="text" class="span3" placeholder="3px">
-                <label>@inputDisabledBackground</label>
+                <label>@input-background-disabled</label>
                 <input type="text" class="span3" placeholder="@grayLighter">
-                <label>@formActionsBackground</label>
+                <label>@form-actions-background</label>
                 <input type="text" class="span3" placeholder="#f5f5f5">
-                <label>@btnPrimaryBackground</label>
+                <label>@btn-backround-primary</label>
                 <input type="text" class="span3" placeholder="@link-color">
-                <label>@btnPrimaryBackgroundHighlight</label>
-                <input type="text" class="span3" placeholder="darken(@white, 10%)">
+                <label>@btn-backround-primary-highlight</label>
+                <input type="text" class="span3" placeholder="darken(#fff, 10%)">
 
               </div><!-- /span -->
               <div class="span3">
@@ -333,7 +333,7 @@
                 <label>@navbarLinkColor</label>
                 <input type="text" class="span3" placeholder="@grayLight">
                 <label>@navbarLinkColorHover</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@navbarLinkColorActive</label>
                 <input type="text" class="span3" placeholder="@navbarLinkColorHover">
                 <label>@navbarLinkBackgroundHover</label>
@@ -343,7 +343,7 @@
                 <label>@navbarSearchBackground</label>
                 <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
                 <label>@navbarSearchBackgroundFocus</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@navbarSearchBorder</label>
                 <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
                 <label>@navbarSearchPlaceholderColor</label>
@@ -356,13 +356,13 @@
 
                 <h3>{{_i}}Dropdowns{{/i}}</h3>
                 <label>@dropdownBackground</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@dropdownBorder</label>
                 <input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
                 <label>@dropdownLinkColor</label>
                 <input type="text" class="span3" placeholder="@grayDark">
                 <label>@dropdownLinkColorHover</label>
-                <input type="text" class="span3" placeholder="@white">
+                <input type="text" class="span3" placeholder="#fff">
                 <label>@dropdownLinkBackgroundHover</label>
                 <input type="text" class="span3" placeholder="@link-color">
               </div><!-- /span -->