diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-06-19 15:14:32 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-06-19 15:14:32 +0200 |
| commit | 717de3937e1b264c04e8ba3fa5dac7aaf25038bc (patch) | |
| tree | 19975d8100c3136bcf6186cd258259a995878185 /addons/web/static/src | |
| parent | 18d9ddb042d04117fb6d2fc868f24eb55a5839df (diff) | |
[WIP] Changed oe_topbar_item
bzr revid: fme@openerp.com-20120619131432-69tuwtw3dr0jhjo8
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 7 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 25 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 22 |
3 files changed, 22 insertions, 32 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d55b320b969..13f04ab6593 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -682,10 +682,7 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar .oe_topbar_item li { - float: left; -} -.openerp .oe_topbar .oe_topbar_item li a { +.openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; line-height: 20px; @@ -694,7 +691,7 @@ vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } -.openerp .oe_topbar .oe_topbar_item li a:hover { +.openerp .oe_topbar .oe_topbar_item:hover { background: #303030; color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 341755cbcb2..5d91ed64a1d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -556,20 +556,17 @@ $colour4: #8a89ba border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) .oe_topbar_item - 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 - background: #303030 - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + 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 diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a82e40c06e5..bd216e09adf 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -316,19 +316,15 @@ </t> <t t-name="UserMenu"> - <ul class="oe_user_menu oe_topbar_item"> - <li class="oe_dropdown"> - <a href="#" class="oe_dropdown_toggle"> - <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> - <span class="oe_topbar_name"/> - </a> - <ul class="oe_dropdown_options"> - <li><a href="#" data-menu="about">About OpenERP</a></li> - <li><a href="#" data-menu="settings">Preferences</a></li> - <li><a href="#" data-menu="logout">Log out</a></li> - </ul> - </li> - </ul> + <a href="#" class="oe_user_menu oe_topbar_item oe_dropdown_toggle"> + <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> + <span class="oe_topbar_name"/> + <ul class="oe_dropdown_options"> + <li><a href="#" data-menu="about">About OpenERP</a></li> + <li><a href="#" data-menu="settings">Preferences</a></li> + <li><a href="#" data-menu="logout">Log out</a></li> + </ul> + </a> </t> <t t-name="UserMenu.about"> <div> |