diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 14496fe3522..3d54aef0fa2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -45,7 +46,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -515,6 +516,12 @@ .openerp .oe_webclient .oe_star_on { color: gold; } +.openerp p.oe_grey { + max-width: 650px; +} +.openerp .oe_grey { + color: #aaaaaa; +} .openerp header { position: relative; border-bottom: 1px solid #cacaca; @@ -1197,7 +1204,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1222,7 +1229,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2048,11 +2055,6 @@ margin: 0 auto; padding: 16px 0 48px; } -.openerp .oe_form header .oe_tags .oe_grey { - color: #aaaaaa; - max-width: 650px; - margin: 0 0 10px 0; -} .openerp .oe_form header .oe_tags div.oe_form_configuration p, .openerp .oe_form header .oe_tags div.oe_form_configuration ul, .openerp .oe_form header .oe_tags div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; @@ -2123,7 +2125,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 784f93d94cf..0567d31b1eb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -450,6 +450,11 @@ $sheet-max-width: 860px text-decoration: none .oe_star_on color: gold + p.oe_grey + max-width: 650px + .oe_grey + color: #aaa + // }}} // Generic blocks {{{ @@ -825,7 +830,7 @@ $sheet-max-width: 860px vertical-align: top text-shadow: 0 1px 1px rgba(0,0,0,0.2) @include transition(all 0.2s ease-out) - &:hover, + &:hover background: rgba(0,0,0,0.2) text-shadow: black 0px 0px 3px color: white @@ -885,7 +890,7 @@ $sheet-max-width: 860px vertical-align: top text-shadow: 0 1px 1px rgba(0,0,0,0.2) @include transition(all 0.2s ease-out) - &:hover, + &:hover background: rgba(0,0,0,0.2) text-shadow: black 0px 0px 3px color: white @@ -1623,10 +1628,6 @@ $sheet-max-width: 860px max-width: $sheet-max-width margin: 0 auto padding: 16px 0 48px - .oe_grey - color: #aaa - max-width: 650px - margin: 0 0 10px 0 div.oe_form_configuration p, ul, ol color: #aaa