amelia: set stateful input color, fix thomaspark#90

sadiqmmm · Mar 29, 2013 · 2cb76ff · 2cb76ff
1 parent fd3915f
commit 2cb76ff
Show file tree

Hide file tree

Showing 3 changed files with 191 additions and 5 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -6869,13 +6869,169 @@ textarea,
 .control-group.warning .control-label,
 .control-group.warning .help-block,
 .control-group.warning .help-inline {
-  color: #f3c4a3;
+  color: #debb27;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #debb27;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #f2e5ac;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #ecd77f;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #debb27;
+  background-color: #df6e1e;
+  border-color: #debb27;
 }
 
 .control-group.error .control-label,
 .control-group.error .help-block,
 .control-group.error .help-inline {
-  color: #efde96;
+  color: #df6e1e;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #df6e1e;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #f3c4a3;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #eda776;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #fffefd;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #fffefd;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #fffefd;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #df6e1e;
+  background-color: #ad1d28;
+  border-color: #df6e1e;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #48ca3b;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #48ca3b;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #93e08b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #6dd563;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #def5dc;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #def5dc;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #def5dc;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #48ca3b;
+  background-color: #48ca3b;
+  border-color: #48ca3b;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #4d3a7d;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #4d3a7d;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #7d65b8;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #624aa0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #b8abd8;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #b8abd8;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #b8abd8;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #4d3a7d;
+  background-color: #4d3a7d;
+  border-color: #4d3a7d;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #f2e5ac;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #f3c4a3;
 }
 
 .control-group.success .control-label,
@@ -6884,6 +7040,12 @@ textarea,
   color: #93e08b;
 }
 
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #7d65b8;
+}
+
 .input-prepend .add-on,
 .input-append .add-on {
   height: 20px;

diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -533,12 +533,28 @@ input, textarea, .search-query, .uneditable-input,
 	border-top: 0px solid transparent;
 }
 
+.control-group.warning {
+  .formFieldState(@yellow, lighten(@yellow, 30%), @warningBackground);
+}
+
+.control-group.error {
+  .formFieldState(@orange, lighten(@orange, 30%), @errorBackground);
+}
+
+.control-group.success {
+  .formFieldState(@green, lighten(@green, 20%), @successBackground);
+}
+
+.control-group.info {
+  .formFieldState(@purple, lighten(@purple, 20%), @infoBackground);
+}
+
 .control-group.warning {
 
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten(@orange, 30%);
+		color: lighten(@yellow, 30%);
 	}
 }
 
@@ -547,7 +563,7 @@ input, textarea, .search-query, .uneditable-input,
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten(@linkColor, 10%);
+		color: lighten(@orange, 30%);
 	}
 }
 
@@ -559,6 +575,14 @@ input, textarea, .search-query, .uneditable-input,
 		color: lighten(@green, 20%);
 	}
 }
+.control-group.info {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten(@purple, 20%);
+	}
+}
 
 .input-prepend .add-on,
 .input-append .add-on {