remove color variables, swap others were appropro

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 12aa52a14482a423db956bf0889dcf94777e9bd6..985cc2deabb4dfc21bfd7644be6b4bd80abf1bfc 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1435,8 +1435,8 @@ select:focus:invalid:focus {
 
 .input-append .active,
 .input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
+  background-color: #dff0d8;
+  border-color: #468847;
 }
 
 .input-prepend .add-on,

diff --git a/docs/customize.html b/docs/customize.html
index 861621c526914468ba36bdaadcbd06762773f449..277d9701a2b9722dd290bf6ad4600d8e7187bad0 100644 (file)
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -247,21 +247,6 @@
                 <input type="text" class="span3" placeholder="#08c">
                 <label>@link-color-hover</label>
                 <input type="text" class="span3" placeholder="darken(@link-color, 15%)">
-                <h3>Colors</h3>
-                <label>@blue</label>
-                <input type="text" class="span3" placeholder="#049cdb">
-                <label>@green</label>
-                <input type="text" class="span3" placeholder="#46a546">
-                <label>@red</label>
-                <input type="text" class="span3" placeholder="#9d261d">
-                <label>@yellow</label>
-                <input type="text" class="span3" placeholder="#ffc40d">
-                <label>@orange</label>
-                <input type="text" class="span3" placeholder="#f89406">
-                <label>@pink</label>
-                <input type="text" class="span3" placeholder="#c3325f">
-                <label>@purple</label>
-                <input type="text" class="span3" placeholder="#7a43b6">
 
                 <h3>Sprites</h3>
                 <label>@iconSpritePath</label>

diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index b25a474d2bd869981e7de01b387789150c4f6d04..b918486760e0f3d5e86e7892112c82405c329d95 100644 (file)
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -179,21 +179,6 @@
                 <input type="text" class="span3" placeholder="#08c">
                 <label>@link-color-hover</label>
                 <input type="text" class="span3" placeholder="darken(@link-color, 15%)">
-                <h3>{{_i}}Colors{{/i}}</h3>
-                <label>@blue</label>
-                <input type="text" class="span3" placeholder="#049cdb">
-                <label>@green</label>
-                <input type="text" class="span3" placeholder="#46a546">
-                <label>@red</label>
-                <input type="text" class="span3" placeholder="#9d261d">
-                <label>@yellow</label>
-                <input type="text" class="span3" placeholder="#ffc40d">
-                <label>@orange</label>
-                <input type="text" class="span3" placeholder="#f89406">
-                <label>@pink</label>
-                <input type="text" class="span3" placeholder="#c3325f">
-                <label>@purple</label>
-                <input type="text" class="span3" placeholder="#7a43b6">
 
                 <h3>{{_i}}Sprites{{/i}}</h3>
                 <label>@iconSpritePath</label>

diff --git a/less/forms.less b/less/forms.less
index 155306f7d3357afaa4bcc1db2ff8b0cf70220361..84ca238e04c5961a390566166f4bee98800a0634 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -479,8 +479,8 @@ select:focus:invalid {
     border-radius: 0;
   }
   .active {
-    background-color: lighten(@green, 30);
-    border-color: @green;
+    background-color: @successBackground;
+    border-color: @successText;
   }
 }
 

diff --git a/less/labels-badges.less b/less/labels-badges.less
index fafad404e4527a02f5166c674e60e9eac6e61dff..6dd8fe0e86051ca1f628ebbd2967cb73623c4258 100644 (file)
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -53,8 +53,8 @@ a {
   &-danger            { background-color: @errorText; }
   &-danger[href]      { background-color: darken(@errorText, 10%); }
   // Warnings (orange)
-  &-warning           { background-color: @orange; }
-  &-warning[href]     { background-color: darken(@orange, 10%); }
+  &-warning           { background-color: #f89406; }
+  &-warning[href]     { background-color: darken(#f89406, 10%); }
   // Success (green)
   &-success           { background-color: @successText; }
   &-success[href]     { background-color: darken(@successText, 10%); }

diff --git a/less/progress-bars.less b/less/progress-bars.less
index 66180026d962a81871f364963ae16754f5bf2cc2..cbff7f2fda269675403146ed9c106d790d598ca8 100644 (file)
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -115,8 +115,8 @@
 
 // Warning (orange)
 .progress-warning .bar, .progress .bar-warning {
-  #gradient > .vertical(lighten(@orange, 15%), @orange);
+  #gradient > .vertical(lighten(#f89406, 15%), #f89406);
 }
 .progress-warning.progress-striped .bar, .progress-striped .bar-warning {
-  #gradient > .striped(lighten(@orange, 15%));
+  #gradient > .striped(lighten(#f89406, 15%));
 }

diff --git a/less/variables.less b/less/variables.less
index ac56b600db643144b42dd3a0b2f0e01ec9f33b92..5194a67da17c34237be02c85d228dd8086b0a215 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -17,17 +17,6 @@
 @grayLighter:           #eee;
 
 
-// Accent colors
-// -------------------------
-@blue:                  #049cdb;
-@green:                 #46a546;
-@red:                   #9d261d;
-@yellow:                #ffc40d;
-@orange:                #f89406;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
-
 // Scaffolding
 // -------------------------