Skip to content

Commit

Permalink
amelia, spruce: fixes text state colors, closes thomaspark#122
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed Aug 6, 2013
1 parent 4642156 commit 260a789
Showing 6 changed files with 103 additions and 57 deletions.
45 changes: 18 additions & 27 deletions 2/amelia/bootstrap.css
Original file line number Diff line number Diff line change
@@ -6204,6 +6204,22 @@ blockquote small {
color: rgba(255, 255, 255, 0.6);
}

.text-warning {
color: #f2e5ac;
}

.text-error {
color: #f3c4a3;
}

.text-success {
color: #b8ebb3;
}

.text-info {
color: #7be9ff;
}

body {
background-color: #0f8790;
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#12a5b0), to(#0f8790));
@@ -7250,36 +7266,11 @@ code {
.modal-header {
color: #ffffff;
background-color: #ad1d28;
border-bottom: none;
}

.modal-body {
color: #444444;
}

.modal-body h1,
.modal-body h2,
.modal-body h3,
.modal-body h4,
.modal-body h5,
.modal-body h6,
.modal-body legend {
color: #ad1d28;
}

.modal-body label,
.modal-body .input-file {
color: #444444;
}

.modal-body .help-block,
.modal-body .help-inline {
color: #aaaaaa;
}

.modal-body textarea,
.modal-body input,
.modal-body .uneditable-input {
border: 1px solid #aaaaaa;
background-color: #3cb9c6;
}

.popover {
2 changes: 1 addition & 1 deletion 2/amelia/bootstrap.min.css

Large diffs are not rendered by default.

40 changes: 18 additions & 22 deletions 2/amelia/bootswatch.less
Original file line number Diff line number Diff line change
@@ -39,6 +39,22 @@ blockquote {
color: rgba(255, 255, 255, 0.6);
}

.text-warning {
color: lighten(@yellow, 30%);
}

.text-error {
color: lighten(@orange, 30%);
}

.text-success {
color: lighten(@green, 30%);
}

.text-info {
color: lighten(@blue, 30%);
}

// SCAFFOLDING
// -----------------------------------------------------

@@ -747,33 +763,13 @@ input, textarea, .search-query, .uneditable-input,

&-header {
background-color: @navbarBackground;
border-bottom: none;
color: @white;
}

&-body {

color: @grayDark;

h1, h2, h3, h4, h5, h6,
legend {
color: @red;
}

label,
.input-file {
color: @grayDark;
}

.help-block,
.help-inline {
color: @grayLight;
}

textarea,
input,
.uneditable-input {
border: 1px solid @grayLight;
}
background-color: @wellBackground;
}
}

35 changes: 32 additions & 3 deletions 2/spruce/bootstrap.css
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
/*!
* Bootstrap v2.3.2
*
* Copyright 2012 Twitter, Inc
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world by @mdo and @fat.
*/

.clearfix {
@@ -6186,6 +6186,22 @@ h6 small {
font-weight: normal !important;
}

.text-warning {
color: #f26522;
}

.text-error {
color: #d14432;
}

.text-success {
color: #015b4e;
}

.text-info {
color: #004e8b;
}

.page-header {
padding-bottom: 5px;
border-bottom: none;
@@ -6605,7 +6621,8 @@ select {

.control-group.warning .control-label,
.control-group.error .control-label,
.control-group.success .control-label {
.control-group.success .control-label,
.control-group.info .control-label {
color: #555555;
}

@@ -6645,6 +6662,18 @@ select {
border: 1px solid #f26522;
}

.control-group.info .help-block,
.control-group.info .help-inline {
color: #2f96b4;
}

.control-group.info input,
.control-group.info select,
.control-group.info textarea {
color: #555555;
border: 1px solid #2f96b4;
}

.alert {
text-shadow: none;
border: none;
6 changes: 3 additions & 3 deletions 2/spruce/bootstrap.min.css

Large diffs are not rendered by default.

32 changes: 31 additions & 1 deletion 2/spruce/bootswatch.less
Original file line number Diff line number Diff line change
@@ -24,6 +24,22 @@ h1, h2, h3, h4, h5, h6 {
font-weight: normal !important;
}

.text-warning {
color: @orange;
}

.text-error {
color: @red;
}

.text-success {
color: @green;
}

.text-info {
color: @blue;
}

// SCAFFOLDING
// --------------------------------------------------

@@ -482,7 +498,8 @@ input, textarea, select {

&.warning,
&.error,
&.success {
&.success,
&.info {

.control-label {
color: @textColor;
@@ -529,6 +546,19 @@ input, textarea, select {
}
}

.control-group.info {

.help-block,
.help-inline {
color: #2f96b4;
}

input, select, textarea {
border: 1px solid #2f96b4;
color: @textColor;
}
}

// ALERTS, LABELS, BADGES
// --------------------------------------------------

0 comments on commit 260a789

Please sign in to comment.