odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged with need_action branch 

bzr revid: tde@openerp.com-20120405124652-dbkt4q5u9hjjw49d
bzr revid: tde@openerp.com-20120405161417-479c1myy9oxwb83c
This commit is contained in:
Thibault Delavallée 2012-04-05 18:14:17 +02:00
parent a3120a0509 00d70016c9
commit ac48d29cd0
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/web/static/src/css/base.css
View File

@ -220,6 +220,19 @@
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_secondary_submenu .oe_menu_counter {
float: right;
background: #8a89ba;
color: #eeeeee;
font-size: 12px;
border: 1px solid lightgray;
padding: 0px 4px 0px 4px;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
margin: 0px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.openerp2 .oe_secondary_submenu .oe_active {
background: #8a89ba;
border-top: 1px solid lightGray;
@ -240,6 +253,10 @@
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_secondary_submenu .oe_active .oe_menu_counter {
background: #eeeeee;
color: #8a89ba;
}
.openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
width: 0;
height: 0;
@ -264,17 +281,6 @@
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c;
}
.oe_menu_counter {
float:right;
background: #eeeeee;
color: #8a89ba;
font-weight: bold;
border-width:1px;
padding-top:2px;
padding-right:4px;
padding-left:4px;
border-radius:2px;
}
.openerp2 .oe_dropdown {
position: relative;
}

13
addons/web/static/src/css/base.sass
View File

@ -238,6 +238,16 @@ $colour4: #8a89ba
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include radius(4px)
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter
float: right
background: #8a89ba
color: #eee
font-size: 12px
border: 1px solid lightgray
padding: 0px 4px 0px 4px
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
margin: 0px
@include radius(4px)
.oe_active
background: $colour4
border-top: 1px solid lightGray
@ -251,6 +261,9 @@ $colour4: #8a89ba
color: $colour4
text-shadow: 0 1px 1px white
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter
background: #eee
color: #8a89ba
.oe_menu_toggler:before
width: 0
height: 0