summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css16
-rw-r--r--addons/web/static/src/css/base.sass35
2 files changed, 19 insertions, 32 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81e179c8de9..c15a37b26f5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1032,14 +1032,6 @@
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
-.openerp .oe_topbar .oe_topbar_item .oe_active {
- background: #303030;
- font-weight: bold;
- color: white;
- -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
- -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
- box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-}
.openerp .oe_topbar .oe_topbar_avatar {
width: 24px;
height: 24px;
@@ -1150,10 +1142,10 @@
padding: 0;
margin: 0;
}
-.openerp .oe_menu li {
+.openerp .oe_menu > li {
float: left;
}
-.openerp .oe_menu a {
+.openerp .oe_menu > li > a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
@@ -1162,14 +1154,14 @@
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
-.openerp .oe_menu a:hover {
+.openerp .oe_menu > li > a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
-.openerp .oe_menu .oe_active {
+.openerp .oe_menu > li > .oe_active {
background: #303030;
font-weight: bold;
color: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3463a25ad79..db56bdbacfa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -810,11 +810,6 @@ $sheet-max-width: 860px
background: #303030
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
- .oe_active
- background: #303030
- font-weight: bold
- color: white
- @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_topbar_avatar
width: 24px
@@ -902,25 +897,25 @@ $sheet-max-width: 860px
float: left
padding: 0
margin: 0
- li
+ > li
float: left
- a
- display: block
- padding: 5px 10px 7px
- line-height: 20px
- height: 20px
- color: #eee
- vertical-align: top
- text-shadow: 0 1px 1px rgba(0,0,0,0.2)
- &:hover
+ > a
+ display: block
+ padding: 5px 10px 7px
+ line-height: 20px
+ height: 20px
+ color: #eee
+ vertical-align: top
+ text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+ &:hover
+ background: #303030
+ color: white
+ @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+ > .oe_active
background: #303030
+ font-weight: bold
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
- .oe_active
- background: #303030
- font-weight: bold
- color: white
- @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_secondary_menu_section
font-weight: bold
margin-left: 8px