From 8af64adc57530d94dad95aabcc0e86b858adc26c Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Tue, 23 Sep 2014 16:21:01 +0200 Subject: [PATCH] last time I touch wells, I promise. --- css-compiled/material-wfont.css | 14 ++++++++------ css-compiled/material.css | 14 ++++++++------ less/welljumbo.less | 13 ++++++++----- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/css-compiled/material-wfont.css b/css-compiled/material-wfont.css index 90e9ac6c..32567c97 100644 --- a/css-compiled/material-wfont.css +++ b/css-compiled/material-wfont.css @@ -82,14 +82,16 @@ body .well .form-control, .container-fluid .well .form-control, body .well:not([class^="well well-material-"]) .form-control, .container .well:not([class^="well well-material-"]) .form-control, -.container-fluid .well:not([class^="well well-material-"]) .form-control, +.container-fluid .well:not([class^="well well-material-"]) .form-control { + color: rgba(0, 0, 0, 0.84); +} body .well .floating-label, .container .well .floating-label, .container-fluid .well .floating-label, body .well:not([class^="well well-material-"]) .floating-label, .container .well:not([class^="well well-material-"]) .floating-label, .container-fluid .well:not([class^="well well-material-"]) .floating-label { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .form-control, .container .well .form-control, @@ -97,7 +99,7 @@ body .well .form-control, body .well:not([class^="well well-material-"]) .form-control, .container .well:not([class^="well well-material-"]) .form-control, .container-fluid .well:not([class^="well well-material-"]) .form-control { - border-bottom-color: rgba(0, 0, 0, 0.84); + border-bottom-color: #7e7e7e; } body .well .form-control::-webkit-input-placeholder, .container .well .form-control::-webkit-input-placeholder, @@ -105,7 +107,7 @@ body .well .form-control::-webkit-input-placeholder, body .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder, .container .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .form-control::-moz-placeholder, .container .well .form-control::-moz-placeholder, @@ -113,7 +115,7 @@ body .well .form-control::-moz-placeholder, body .well:not([class^="well well-material-"]) .form-control::-moz-placeholder, .container .well:not([class^="well well-material-"]) .form-control::-moz-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control::-moz-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; opacity: 1; } body .well .form-control:-ms-input-placeholder, @@ -122,7 +124,7 @@ body .well .form-control:-ms-input-placeholder, body .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder, .container .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .option, .container .well .option, diff --git a/css-compiled/material.css b/css-compiled/material.css index c225e5be..a5b7e304 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -81,14 +81,16 @@ body .well .form-control, .container-fluid .well .form-control, body .well:not([class^="well well-material-"]) .form-control, .container .well:not([class^="well well-material-"]) .form-control, -.container-fluid .well:not([class^="well well-material-"]) .form-control, +.container-fluid .well:not([class^="well well-material-"]) .form-control { + color: rgba(0, 0, 0, 0.84); +} body .well .floating-label, .container .well .floating-label, .container-fluid .well .floating-label, body .well:not([class^="well well-material-"]) .floating-label, .container .well:not([class^="well well-material-"]) .floating-label, .container-fluid .well:not([class^="well well-material-"]) .floating-label { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .form-control, .container .well .form-control, @@ -96,7 +98,7 @@ body .well .form-control, body .well:not([class^="well well-material-"]) .form-control, .container .well:not([class^="well well-material-"]) .form-control, .container-fluid .well:not([class^="well well-material-"]) .form-control { - border-bottom-color: rgba(0, 0, 0, 0.84); + border-bottom-color: #7e7e7e; } body .well .form-control::-webkit-input-placeholder, .container .well .form-control::-webkit-input-placeholder, @@ -104,7 +106,7 @@ body .well .form-control::-webkit-input-placeholder, body .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder, .container .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control::-webkit-input-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .form-control::-moz-placeholder, .container .well .form-control::-moz-placeholder, @@ -112,7 +114,7 @@ body .well .form-control::-moz-placeholder, body .well:not([class^="well well-material-"]) .form-control::-moz-placeholder, .container .well:not([class^="well well-material-"]) .form-control::-moz-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control::-moz-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; opacity: 1; } body .well .form-control:-ms-input-placeholder, @@ -121,7 +123,7 @@ body .well .form-control:-ms-input-placeholder, body .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder, .container .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder, .container-fluid .well:not([class^="well well-material-"]) .form-control:-ms-input-placeholder { - color: rgba(0, 0, 0, 0.84); + color: #7e7e7e; } body .well .option, .container .well .option, diff --git a/less/welljumbo.less b/less/welljumbo.less index dfe01044..c114fdee 100644 --- a/less/welljumbo.less +++ b/less/welljumbo.less @@ -2,20 +2,23 @@ body, .container, .container-fluid { .well, .well:not([class^="well well-material-"]) { - &, .form-control, .floating-label { + &, .form-control { color: @lightbg-text; } + .floating-label { + color: #7e7e7e; + } .form-control { - border-bottom-color: @lightbg-text; + border-bottom-color: #7e7e7e; &::-webkit-input-placeholder { - color: @lightbg-text; + color: #7e7e7e; } &::-moz-placeholder { - color: @lightbg-text; + color: #7e7e7e; opacity: 1; } &:-ms-input-placeholder { - color: @lightbg-text; + color: #7e7e7e; } } .option, .create {