kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

remove color variables, swap others were appropro

Browse source
This commit is contained in:
Mark Otto 2012-11-30 15:18:49 -08:00
parent 0ef347706c
commit 12a00f62a9
7 changed files with 8 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/assets/css/bootstrap.css vendored
View file

@ -1435,8 +1435,8 @@ select:focus:invalid:focus {
.input-append .active, .input-append .active,
.input-prepend .active { .input-prepend .active {
background-color: #a9dba9; background-color: #dff0d8;
border-color: #46a546; border-color: #468847;
} }
.input-prepend .add-on, .input-prepend .add-on,

15
docs/customize.html
View file

@ -247,21 +247,6 @@
<input type="text" class="span3" placeholder="#08c"> <input type="text" class="span3" placeholder="#08c">
<label>@link-color-hover</label> <label>@link-color-hover</label>
<input type="text" class="span3" placeholder="darken(@link-color, 15%)"> <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> <h3>Sprites</h3>
<label>@iconSpritePath</label> <label>@iconSpritePath</label>

15
docs/templates/pages/customize.mustache vendored
View file

@ -179,21 +179,6 @@
<input type="text" class="span3" placeholder="#08c"> <input type="text" class="span3" placeholder="#08c">
<label>@link-color-hover</label> <label>@link-color-hover</label>
<input type="text" class="span3" placeholder="darken(@link-color, 15%)"> <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> <h3>{{_i}}Sprites{{/i}}</h3>
<label>@iconSpritePath</label> <label>@iconSpritePath</label>

4
less/forms.less
View file

@ -479,8 +479,8 @@ select:focus:invalid {
border-radius: 0; border-radius: 0;
} }
.active { .active {
background-color: lighten(@green, 30); background-color: @successBackground;
border-color: @green; border-color: @successText;
} }
} }

4
less/labels-badges.less
View file

@ -53,8 +53,8 @@ a {
&-danger { background-color: @errorText; } &-danger { background-color: @errorText; }
&-danger[href] { background-color: darken(@errorText, 10%); } &-danger[href] { background-color: darken(@errorText, 10%); }
// Warnings (orange) // Warnings (orange)
&-warning { background-color: @orange; } &-warning { background-color: #f89406; }
&-warning[href] { background-color: darken(@orange, 10%); } &-warning[href] { background-color: darken(#f89406, 10%); }
// Success (green) // Success (green)
&-success { background-color: @successText; } &-success { background-color: @successText; }
&-success[href] { background-color: darken(@successText, 10%); } &-success[href] { background-color: darken(@successText, 10%); }

4
less/progress-bars.less
View file

@ -115,8 +115,8 @@
// Warning (orange) // Warning (orange)
.progress-warning .bar, .progress .bar-warning { .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 { .progress-warning.progress-striped .bar, .progress-striped .bar-warning {
#gradient > .striped(lighten(@orange, 15%)); #gradient > .striped(lighten(#f89406, 15%));
} }

11
less/variables.less
View file

@ -17,17 +17,6 @@
@grayLighter: #eee; @grayLighter: #eee;
// Accent colors
// -------------------------
@blue: #049cdb;
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
// Scaffolding // Scaffolding
// ------------------------- // -------------------------