fixed color of inputs inside well-material-colors

Federico Zivolo · Federico Zivolo · commit 484b69c84bd2 · 2014-09-23T09:45:04.000+02:00
diff --git a/css-compiled/material-wfont.css b/css-compiled/material-wfont.css
@@ -1201,9 +1201,6 @@ select[multiple].form-control.focus {
   animation-fill-mode: forwards;
   opacity: 0;
 }
-.form-control-wrapper select ~ .material-input:before {
-  bottom: 1px;
-}
 .form-control-wrapper select ~ .material-input:after {
   display: none;
 }
@@ -1890,9 +1887,22 @@ body .jumbotron-material-lightgrey,
 }
 body [class^="well well-material"],
 .container [class^="well well-material"],
-.container-fluid [class^="well well-material"] {
+.container-fluid [class^="well well-material"],
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
   color: rgba(255, 255, 255, 0.84);
 }
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
+  border-bottom-color: rgba(255, 255, 255, 0.84);
+}
+body [class^="well well-material"] .option,
+.container [class^="well well-material"] .option,
+.container-fluid [class^="well well-material"] .option {
+  color: rgba(0, 0, 0, 0.84);
+}
 .modal-content {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   border-radius: 0;
diff --git a/css-compiled/material.css b/css-compiled/material.css
@@ -1200,9 +1200,6 @@ select[multiple].form-control.focus {
   animation-fill-mode: forwards;
   opacity: 0;
 }
-.form-control-wrapper select ~ .material-input:before {
-  bottom: 1px;
-}
 .form-control-wrapper select ~ .material-input:after {
   display: none;
 }
@@ -1889,9 +1886,22 @@ body .jumbotron-material-lightgrey,
 }
 body [class^="well well-material"],
 .container [class^="well well-material"],
-.container-fluid [class^="well well-material"] {
+.container-fluid [class^="well well-material"],
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
   color: rgba(255, 255, 255, 0.84);
 }
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
+  border-bottom-color: rgba(255, 255, 255, 0.84);
+}
+body [class^="well well-material"] .option,
+.container [class^="well well-material"] .option,
+.container-fluid [class^="well well-material"] .option {
+  color: rgba(0, 0, 0, 0.84);
+}
 .modal-content {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   border-radius: 0;
diff --git a/less/inputs.less b/less/inputs.less
@@ -106,9 +106,6 @@ select[multiple].form-control {
         opacity: 0;
     }
 
-    select ~ .material-input:before {
-        bottom: 1px;
-    }
     select ~ .material-input:after {
         display: none;
     }
diff --git a/less/material.less b/less/material.less
@@ -51,7 +51,17 @@ body, .container, .container-fluid {
         .variations(~"", background-color, #FFF);
     }
     [class^="well well-material"] {
-        color: @darkbg-text;
+        &, .form-control {
+            color: @darkbg-text;
+        }
+        .form-control {
+            border-bottom-color: @darkbg-text;
+        }
+        // Rule to fix selectize plugin
+        .option {
+            color: @lightbg-text;
+        }
+
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,6 @@ select[multiple].form-control {`
`106`	`106`	`opacity: 0;`
`107`	`107`	`}`
`108`	`108`
`109`		`- select ~ .material-input:before {`
`110`		`- bottom: 1px;`
`111`		`- }`
`112`	`109`	`select ~ .material-input:after {`
`113`	`110`	`display: none;`
`114`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,17 @@ body, .container, .container-fluid {`
`51`	`51`	`.variations(~"", background-color, #FFF);`
`52`	`52`	`}`
`53`	`53`	`[class^="well well-material"] {`
`54`		`- color: @darkbg-text;`
	`54`	`+ &, .form-control {`
	`55`	`+ color: @darkbg-text;`
	`56`	`+ }`
	`57`	`+ .form-control {`
	`58`	`+ border-bottom-color: @darkbg-text;`
	`59`	`+ }`
	`60`	`+ // Rule to fix selectize plugin`
	`61`	`+ .option {`
	`62`	`+ color: @lightbg-text;`
	`63`	`+ }`
	`64`	`+`
`55`	`65`	`}`
`56`	`66`	`}`
`57`	`67`