cosmo: add control-info state

entelesis · Jul 29, 2013 · 1852ae7 · 1852ae7
1 parent 721a5f1
commit 1852ae7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 23 deletions.
diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css
@@ -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 {
@@ -6525,15 +6525,10 @@ div.subnav-fixed {
           box-shadow: none;
 }
 
-.table tbody tr.success td {
-  color: #ffffff;
-}
-
-.table tbody tr.error td {
-  color: #ffffff;
-}
-
-.table tbody tr.info td {
+.table tbody tr.success td,
+.table tbody tr.error td,
+.table tbody tr.info td,
+.table tbody tr.warning td {
   color: #ffffff;
 }
 
@@ -6603,6 +6598,19 @@ input[type="color"] {
   border-color: #ff0039;
 }
 
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #9954bb;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #080808;
+  border-color: #9954bb;
+}
+
 .control-group.success .control-label,
 .control-group.success .help-block,
 .control-group.success .help-inline {

diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css
diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less
@@ -362,15 +362,10 @@ div.subnav {
 
 .table {
 
-	tbody tr.success td {
-		color: @white;
-	}
-
-	tbody tr.error td {
-		color: @white;
-	}
-
-	tbody tr.info td {
+	tbody tr.success td,
+	tbody tr.error td,
+	tbody tr.info td,
+	tbody tr.warning td {
 		color: @white;
 	}
 
@@ -434,6 +429,22 @@ input[type="search"], input[type="tel"], input[type="color"] {
 		}
 	}
 
+	&.info {
+
+		.control-label,
+		.help-block,
+		.help-inline {
+			color: @purple;
+		}
+
+		input,
+		select,
+		textarea {
+			border-color: @purple;
+			color: @grayDarker;
+		}
+	}
+
 	&.success {
 
 		.control-label,