From 7d0d047f587c49fc5147a9bd654e67ea4eb65c3e Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Tue, 23 Sep 2014 13:51:51 +0200 Subject: [PATCH] minor fix for nested wells --- css-compiled/material-wfont.css | 253 +++++++++++++++----------------- css-compiled/material.css | 251 +++++++++++++++---------------- less/welljumbo.less | 9 +- 3 files changed, 245 insertions(+), 268 deletions(-) diff --git a/css-compiled/material-wfont.css b/css-compiled/material-wfont.css index dfb78e3f..6006ff6e 100644 --- a/css-compiled/material-wfont.css +++ b/css-compiled/material-wfont.css @@ -71,124 +71,6 @@ h6, .h6 { font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; } -body .well, -.container .well, -.container-fluid .well, -body .well-default, -.container .well-default, -.container-fluid .well-default { - background-color: #ffffff; -} -body .well-primary, -.container .well-primary, -.container-fluid .well-primary { - background-color: #4285f4; -} -body .well-success, -.container .well-success, -.container-fluid .well-success { - background-color: #0f9d58; -} -body .well-info, -.container .well-info, -.container-fluid .well-info { - background-color: #03a9f4; -} -body .well-warning, -.container .well-warning, -.container-fluid .well-warning { - background-color: #ff5722; -} -body .well-danger, -.container .well-danger, -.container-fluid .well-danger { - background-color: #f44336; -} -body .well-material-red, -.container .well-material-red, -.container-fluid .well-material-red { - background-color: #f44336; -} -body .well-material-pink, -.container .well-material-pink, -.container-fluid .well-material-pink { - background-color: #e91e63; -} -body .well-material-purple, -.container .well-material-purple, -.container-fluid .well-material-purple { - background-color: #9c27b0; -} -body .well-material-deeppurple, -.container .well-material-deeppurple, -.container-fluid .well-material-deeppurple { - background-color: #673ab7; -} -body .well-material-indigo, -.container .well-material-indigo, -.container-fluid .well-material-indigo { - background-color: #3f51b5; -} -body .well-material-lightblue, -.container .well-material-lightblue, -.container-fluid .well-material-lightblue { - background-color: #03a9f4; -} -body .well-material-cyan, -.container .well-material-cyan, -.container-fluid .well-material-cyan { - background-color: #00bcd4; -} -body .well-material-teal, -.container .well-material-teal, -.container-fluid .well-material-teal { - background-color: #009688; -} -body .well-material-lightgreen, -.container .well-material-lightgreen, -.container-fluid .well-material-lightgreen { - background-color: #8bc34a; -} -body .well-material-lime, -.container .well-material-lime, -.container-fluid .well-material-lime { - background-color: #cddc39; -} -body .well-material-lightyellow, -.container .well-material-lightyellow, -.container-fluid .well-material-lightyellow { - background-color: #ffeb3b; -} -body .well-material-orange, -.container .well-material-orange, -.container-fluid .well-material-orange { - background-color: #ff9800; -} -body .well-material-deeporange, -.container .well-material-deeporange, -.container-fluid .well-material-deeporange { - background-color: #ff5722; -} -body .well-material-grey, -.container .well-material-grey, -.container-fluid .well-material-grey { - background-color: #9e9e9e; -} -body .well-material-bluegrey, -.container .well-material-bluegrey, -.container-fluid .well-material-bluegrey { - background-color: #607d8b; -} -body .well-material-brown, -.container .well-material-brown, -.container-fluid .well-material-brown { - background-color: #795548; -} -body .well-material-lightgrey, -.container .well-material-lightgrey, -.container-fluid .well-material-lightgrey { - background-color: #ececec; -} body [class^="well-material"], .container [class^="well-material"], .container-fluid [class^="well-material"], @@ -240,20 +122,6 @@ body [class="jumbotron"], .container-fluid [class="jumbotron"], body [class^="jumbotron "], .container [class^="jumbotron "], -.container-fluid [class^="jumbotron "] { - background-color: #fff; -} -body [class="well"], -.container [class="well"], -.container-fluid [class="well"], -body [class^="well "], -.container [class^="well "], -.container-fluid [class^="well "], -body [class="jumbotron"], -.container [class="jumbotron"], -.container-fluid [class="jumbotron"], -body [class^="jumbotron "], -.container [class^="jumbotron "], .container-fluid [class^="jumbotron "], body [class="well"] .form-control, .container [class="well"] .form-control, @@ -373,6 +241,9 @@ body .jumbotron, body [class^="well-material"], .container [class^="well-material"], .container-fluid [class^="well-material"] { + background-color: #fff; + padding: 19px; + margin-bottom: 20px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); border-radius: 2px; border: 0; @@ -388,6 +259,124 @@ body [class^="well-material"] p, .container-fluid [class^="well-material"] p { font-weight: 300; } +body .well, +.container .well, +.container-fluid .well, +body .well-default, +.container .well-default, +.container-fluid .well-default { + background-color: #ffffff; +} +body .well-primary, +.container .well-primary, +.container-fluid .well-primary { + background-color: #4285f4; +} +body .well-success, +.container .well-success, +.container-fluid .well-success { + background-color: #0f9d58; +} +body .well-info, +.container .well-info, +.container-fluid .well-info { + background-color: #03a9f4; +} +body .well-warning, +.container .well-warning, +.container-fluid .well-warning { + background-color: #ff5722; +} +body .well-danger, +.container .well-danger, +.container-fluid .well-danger { + background-color: #f44336; +} +body .well-material-red, +.container .well-material-red, +.container-fluid .well-material-red { + background-color: #f44336; +} +body .well-material-pink, +.container .well-material-pink, +.container-fluid .well-material-pink { + background-color: #e91e63; +} +body .well-material-purple, +.container .well-material-purple, +.container-fluid .well-material-purple { + background-color: #9c27b0; +} +body .well-material-deeppurple, +.container .well-material-deeppurple, +.container-fluid .well-material-deeppurple { + background-color: #673ab7; +} +body .well-material-indigo, +.container .well-material-indigo, +.container-fluid .well-material-indigo { + background-color: #3f51b5; +} +body .well-material-lightblue, +.container .well-material-lightblue, +.container-fluid .well-material-lightblue { + background-color: #03a9f4; +} +body .well-material-cyan, +.container .well-material-cyan, +.container-fluid .well-material-cyan { + background-color: #00bcd4; +} +body .well-material-teal, +.container .well-material-teal, +.container-fluid .well-material-teal { + background-color: #009688; +} +body .well-material-lightgreen, +.container .well-material-lightgreen, +.container-fluid .well-material-lightgreen { + background-color: #8bc34a; +} +body .well-material-lime, +.container .well-material-lime, +.container-fluid .well-material-lime { + background-color: #cddc39; +} +body .well-material-lightyellow, +.container .well-material-lightyellow, +.container-fluid .well-material-lightyellow { + background-color: #ffeb3b; +} +body .well-material-orange, +.container .well-material-orange, +.container-fluid .well-material-orange { + background-color: #ff9800; +} +body .well-material-deeporange, +.container .well-material-deeporange, +.container-fluid .well-material-deeporange { + background-color: #ff5722; +} +body .well-material-grey, +.container .well-material-grey, +.container-fluid .well-material-grey { + background-color: #9e9e9e; +} +body .well-material-bluegrey, +.container .well-material-bluegrey, +.container-fluid .well-material-bluegrey { + background-color: #607d8b; +} +body .well-material-brown, +.container .well-material-brown, +.container-fluid .well-material-brown { + background-color: #795548; +} +body .well-material-lightgrey, +.container .well-material-lightgrey, +.container-fluid .well-material-lightgrey { + background-color: #ececec; +} .btn { position: relative; padding: 8px 30px; diff --git a/css-compiled/material.css b/css-compiled/material.css index c9cf16ce..7d9d28bd 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -70,124 +70,6 @@ h6, .h6 { font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; } -body .well, -.container .well, -.container-fluid .well, -body .well-default, -.container .well-default, -.container-fluid .well-default { - background-color: #ffffff; -} -body .well-primary, -.container .well-primary, -.container-fluid .well-primary { - background-color: #4285f4; -} -body .well-success, -.container .well-success, -.container-fluid .well-success { - background-color: #0f9d58; -} -body .well-info, -.container .well-info, -.container-fluid .well-info { - background-color: #03a9f4; -} -body .well-warning, -.container .well-warning, -.container-fluid .well-warning { - background-color: #ff5722; -} -body .well-danger, -.container .well-danger, -.container-fluid .well-danger { - background-color: #f44336; -} -body .well-material-red, -.container .well-material-red, -.container-fluid .well-material-red { - background-color: #f44336; -} -body .well-material-pink, -.container .well-material-pink, -.container-fluid .well-material-pink { - background-color: #e91e63; -} -body .well-material-purple, -.container .well-material-purple, -.container-fluid .well-material-purple { - background-color: #9c27b0; -} -body .well-material-deeppurple, -.container .well-material-deeppurple, -.container-fluid .well-material-deeppurple { - background-color: #673ab7; -} -body .well-material-indigo, -.container .well-material-indigo, -.container-fluid .well-material-indigo { - background-color: #3f51b5; -} -body .well-material-lightblue, -.container .well-material-lightblue, -.container-fluid .well-material-lightblue { - background-color: #03a9f4; -} -body .well-material-cyan, -.container .well-material-cyan, -.container-fluid .well-material-cyan { - background-color: #00bcd4; -} -body .well-material-teal, -.container .well-material-teal, -.container-fluid .well-material-teal { - background-color: #009688; -} -body .well-material-lightgreen, -.container .well-material-lightgreen, -.container-fluid .well-material-lightgreen { - background-color: #8bc34a; -} -body .well-material-lime, -.container .well-material-lime, -.container-fluid .well-material-lime { - background-color: #cddc39; -} -body .well-material-lightyellow, -.container .well-material-lightyellow, -.container-fluid .well-material-lightyellow { - background-color: #ffeb3b; -} -body .well-material-orange, -.container .well-material-orange, -.container-fluid .well-material-orange { - background-color: #ff9800; -} -body .well-material-deeporange, -.container .well-material-deeporange, -.container-fluid .well-material-deeporange { - background-color: #ff5722; -} -body .well-material-grey, -.container .well-material-grey, -.container-fluid .well-material-grey { - background-color: #9e9e9e; -} -body .well-material-bluegrey, -.container .well-material-bluegrey, -.container-fluid .well-material-bluegrey { - background-color: #607d8b; -} -body .well-material-brown, -.container .well-material-brown, -.container-fluid .well-material-brown { - background-color: #795548; -} -body .well-material-lightgrey, -.container .well-material-lightgrey, -.container-fluid .well-material-lightgrey { - background-color: #ececec; -} body [class^="well-material"], .container [class^="well-material"], .container-fluid [class^="well-material"], @@ -239,20 +121,6 @@ body [class="jumbotron"], .container-fluid [class="jumbotron"], body [class^="jumbotron "], .container [class^="jumbotron "], -.container-fluid [class^="jumbotron "] { - background-color: #fff; -} -body [class="well"], -.container [class="well"], -.container-fluid [class="well"], -body [class^="well "], -.container [class^="well "], -.container-fluid [class^="well "], -body [class="jumbotron"], -.container [class="jumbotron"], -.container-fluid [class="jumbotron"], -body [class^="jumbotron "], -.container [class^="jumbotron "], .container-fluid [class^="jumbotron "], body [class="well"] .form-control, .container [class="well"] .form-control, @@ -372,6 +240,7 @@ body .jumbotron, body [class^="well-material"], .container [class^="well-material"], .container-fluid [class^="well-material"] { + background-color: #fff; padding: 19px; margin-bottom: 20px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); @@ -389,6 +258,124 @@ body [class^="well-material"] p, .container-fluid [class^="well-material"] p { font-weight: 300; } +body .well, +.container .well, +.container-fluid .well, +body .well-default, +.container .well-default, +.container-fluid .well-default { + background-color: #ffffff; +} +body .well-primary, +.container .well-primary, +.container-fluid .well-primary { + background-color: #4285f4; +} +body .well-success, +.container .well-success, +.container-fluid .well-success { + background-color: #0f9d58; +} +body .well-info, +.container .well-info, +.container-fluid .well-info { + background-color: #03a9f4; +} +body .well-warning, +.container .well-warning, +.container-fluid .well-warning { + background-color: #ff5722; +} +body .well-danger, +.container .well-danger, +.container-fluid .well-danger { + background-color: #f44336; +} +body .well-material-red, +.container .well-material-red, +.container-fluid .well-material-red { + background-color: #f44336; +} +body .well-material-pink, +.container .well-material-pink, +.container-fluid .well-material-pink { + background-color: #e91e63; +} +body .well-material-purple, +.container .well-material-purple, +.container-fluid .well-material-purple { + background-color: #9c27b0; +} +body .well-material-deeppurple, +.container .well-material-deeppurple, +.container-fluid .well-material-deeppurple { + background-color: #673ab7; +} +body .well-material-indigo, +.container .well-material-indigo, +.container-fluid .well-material-indigo { + background-color: #3f51b5; +} +body .well-material-lightblue, +.container .well-material-lightblue, +.container-fluid .well-material-lightblue { + background-color: #03a9f4; +} +body .well-material-cyan, +.container .well-material-cyan, +.container-fluid .well-material-cyan { + background-color: #00bcd4; +} +body .well-material-teal, +.container .well-material-teal, +.container-fluid .well-material-teal { + background-color: #009688; +} +body .well-material-lightgreen, +.container .well-material-lightgreen, +.container-fluid .well-material-lightgreen { + background-color: #8bc34a; +} +body .well-material-lime, +.container .well-material-lime, +.container-fluid .well-material-lime { + background-color: #cddc39; +} +body .well-material-lightyellow, +.container .well-material-lightyellow, +.container-fluid .well-material-lightyellow { + background-color: #ffeb3b; +} +body .well-material-orange, +.container .well-material-orange, +.container-fluid .well-material-orange { + background-color: #ff9800; +} +body .well-material-deeporange, +.container .well-material-deeporange, +.container-fluid .well-material-deeporange { + background-color: #ff5722; +} +body .well-material-grey, +.container .well-material-grey, +.container-fluid .well-material-grey { + background-color: #9e9e9e; +} +body .well-material-bluegrey, +.container .well-material-bluegrey, +.container-fluid .well-material-bluegrey { + background-color: #607d8b; +} +body .well-material-brown, +.container .well-material-brown, +.container-fluid .well-material-brown { + background-color: #795548; +} +body .well-material-lightgrey, +.container .well-material-lightgrey, +.container-fluid .well-material-lightgrey { + background-color: #ececec; +} .btn { position: relative; padding: 8px 30px; diff --git a/less/welljumbo.less b/less/welljumbo.less index bc349175..49dbb2e9 100644 --- a/less/welljumbo.less +++ b/less/welljumbo.less @@ -1,8 +1,5 @@ // main: material.less body, .container, .container-fluid { - .well { - .variations(~"", background-color, #FFF); - } [class^="well-material"] { &, .form-control, .floating-label { color: @darkbg-text; @@ -27,7 +24,6 @@ body, .container, .container-fluid { } [class="well"], [class^="well "], [class="jumbotron"], [class^="jumbotron "] { - background-color: #fff; &, .form-control, .floating-label { color: @lightbg-text; } @@ -51,6 +47,8 @@ body, .container, .container-fluid { } .well, .jumbotron, [class^="well-material"] { + + background-color: #fff; padding: 19px; margin-bottom: 20px; .shadow-z-2(); @@ -60,4 +58,7 @@ body, .container, .container-fluid { font-weight: 300; } } + .well { + .variations(~"", background-color, #FFF); + } }