diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-04-05 14:50:46 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-04-05 14:50:46 +0200 |
| commit | dd521adc3b4aa5de5eee33c00f157b12465c7dd5 (patch) | |
| tree | c4c7f2d9a5ac0d1ac9a247dd26b4fffbd02eaf78 /addons/web/static/src/css | |
| parent | 724a07916e97df2be599a71cdaefc0995e1e9d27 (diff) | |
| parent | bf51fd87daab316a9aa6054af279f96e23a72e8d (diff) | |
[MERGE] Merged with sbh branch holding code update
bzr revid: tde@openerp.com-20120405125046-ixvmxuw4wkv4yksp
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 33 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 20 |
2 files changed, 42 insertions, 11 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3f44d6f6cda..0554328c49e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -220,6 +220,17 @@ -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 li .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_secondary_submenu .oe_active { background: #8a89ba; border-top: 1px solid lightGray; @@ -240,6 +251,17 @@ -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 { + 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_secondary_submenu .oe_menu_toggler:before { width: 0; height: 0; @@ -264,17 +286,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; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c31f501c499..fda9e10a0f0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -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: #eeeeee + color: #8a89ba + font-weight: bold + border-width: 1px + padding-top: 2px + padding-right: 4px + padding-left: 4px + border-radius: 2px .oe_active background: $colour4 border-top: 1px solid lightGray @@ -251,6 +261,16 @@ $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 + float: right + background: #eeeeee + color: #8a89ba + font-weight: bold + border-width: 1px + padding-top: 2px + padding-right: 4px + padding-left: 4px + border-radius: 2px .oe_menu_toggler:before width: 0 height: 0 |