From dbcac346d66012b9615ff2697ebb60dcea245d02 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Mar 2012 10:12:54 +0100 Subject: [PATCH] [IMP] simplify opacity mixin, add missing variants to vertical and radial gradients bzr revid: xmo@openerp.com-20120307091254-x9kg0ua1twbjmxp9 --- addons/web/static/src/css/base.css | 26 ++++++++++++++------------ addons/web/static/src/css/base.sass | 19 +++++++++++-------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b81dea89050..52dcc46ec15 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -29,10 +29,13 @@ height: 31px; border-top: solid 1px #d3d3d3; border-bottom: solid 1px black; - background: #646060; - background: -moz-linear-gradient(#646060, #262626); - background: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); - background: -webkit-linear-gradient(#646060, #262626); + background-color: #646060; + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); + background-image: -webkit-linear-gradient(top, #646060, #262626); + background-image: -moz-linear-gradient(top, #646060, #262626); + background-image: -ms-linear-gradient(top, #646060, #262626); + background-image: -o-linear-gradient(top, #646060, #262626); + background-image: linear-gradient(to bottom, #646060, #262626); } .openerp2 .oe_topbar .oe_systray { float: right; @@ -226,8 +229,6 @@ border-bottom: 4px solid transparent; border-left: 4px solid #4c4c4c; filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; opacity: 0.5; } .openerp2 .oe_secondary_submenu .oe_menu_opened:before { @@ -263,8 +264,6 @@ border-right: 4px solid transparent; border-top: 4px solid white; filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; opacity: 0.5; } .openerp2 .oe_user_menu .oe_dropdown_options { @@ -309,10 +308,13 @@ color: #eeeeee; } .openerp2 .oe_user_menu .oe_dropdown_options li a:hover { - background: #292929; - background: -moz-linear-gradient(#292929, #191919); - background: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background: -webkit-linear-gradient(#292929, #191919); + background-color: #292929; + background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(to bottom, #292929, #191919); -moz-box-shadow: none; -webkit-box-shadow: none; -box-shadow: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cfb8178de12..92b8101f2b7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -5,16 +5,21 @@ $colour4: #8a89ba // Mixins {{{ @mixin vertical-gradient($startColor: #555, $endColor: #333) - background: $startColor - background: -moz-linear-gradient($startColor, $endColor) - background: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) - background: -webkit-linear-gradient($startColor, $endColor) + background-color: $startColor + background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ + background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ + background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ + background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ + background-image: linear-gradient(to bottom, $startColor, $endColor) + @mixin radial-gradient($gradient) background-position: center center - background-image: radial-gradient($gradient) - background-image: -moz-radial-gradient($gradient) background-image: -webkit-radial-gradient(circle, $gradient) + background-image: -moz-radial-gradient($gradient) + background-image: -ms-radial-gradient($gradient) + background-image: radial-gradient($gradient) @mixin radius($radius: 5px) -moz-border-radius: $radius @@ -35,8 +40,6 @@ $colour4: #8a89ba @mixin opacity($opacity: .5) filter: alpha(opacity=$opacity * 100) - -khtml-opacity: $opacity - -moz-opacity: $opacity opacity: $opacity @mixin background-clip($clip: padding-box)