diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-05-23 17:06:50 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-05-23 17:06:50 +0200 |
| commit | 779aabfc5b2908b8f2fd42a7c15f866c403cdc61 (patch) | |
| tree | 549a37c3f6f4d776197ae26a8dd3c04fcae6b61f /addons/web/static | |
| parent | b374cf0089afa95228e66e614b5c15a78d559c13 (diff) | |
[FIX] various css fixes related to scrolling
(1) it seems that position:relative behaviour is undefined in a td,
so it has been moved to the div below oe_application
(2) the left menu bar can now scroll vertically if necessary.
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 18 |
3 files changed, 19 insertions, 10 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8f8db21a2a7..5a95ee15a32 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -996,6 +996,10 @@ text-shadow: none; padding-bottom: 16px; } +.openerp .oe_leftbar > div { + max-height: 100%; + overflow-y: auto; +} .openerp a.oe_logo { position: relative; width: 220px; @@ -1135,12 +1139,12 @@ .openerp .oe_application { width: 100%; height: 100%; - position: relative; } .openerp .oe_application a { color: #7c7bad; } .openerp .oe_application > div { + position: relative; height: 100%; } .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d70b03006f0..df5689c4574 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -845,6 +845,9 @@ $sheet-padding: 16px border-right: 1px solid $tag-border text-shadow: none padding-bottom: 16px + > div + max-height: 100% + overflow-y: auto a.oe_logo position: relative width: 220px @@ -952,10 +955,10 @@ $sheet-padding: 16px .oe_application width: 100% height: 100% - position: relative a color: $link-color > div + position: relative height: 100% > .oe_view_manager > .oe_view_manager_body diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 593e04b2b61..5aad3487403 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -440,14 +440,16 @@ </tr> <tr> <td class="oe_leftbar" valign="top"> - <t t-set="debug" t-value="__debug__ ? '&debug' : ''"/> - <a class="oe_logo" t-attf-href="/web?#{debug}"> - <span class="oe_logo_edit">Edit Company data</span> - <img t-att-src='widget.session.url("/web/binary/company_logo")'/> - </a> - <div class="oe_secondary_menus_container"/> - <div class="oe_footer"> - Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> + <div> + <t t-set="debug" t-value="__debug__ ? '&debug' : ''"/> + <a class="oe_logo" t-attf-href="/web?#{debug}"> + <span class="oe_logo_edit">Edit Company data</span> + <img t-att-src='widget.session.url("/web/binary/company_logo")'/> + </a> + <div class="oe_secondary_menus_container"/> + <div class="oe_footer"> + Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> + </div> </div> </td> <td class="oe_application"> |