diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-09-17 16:32:54 +0200 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2014-09-18 10:36:37 +0200 |
| commit | fa339af2e40d1ad76849d7f4e3ab283cc18649e6 (patch) | |
| tree | 881e1dde94f35ca4430e0a4583ebd545e291eef2 /addons/web/static/src | |
| parent | d9e72a3716488ce8b7ae69a542d8fa1534abaa0b (diff) | |
[FIX] css: move overflow auto from body to webclient to prevent some element from triggering anoter scrollbar
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 8 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index aa8278d99e8..8af9a3b7359 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -8,7 +8,6 @@ font-weight: normal; font-style: normal; } - @font-face { font-family: "EntypoRegular"; src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); @@ -19,7 +18,6 @@ font-weight: normal; font-style: normal; } - #oe_main_menu_navbar { min-height: 34px; z-index: 1001; @@ -85,6 +83,7 @@ } .openerp.openerp_webclient_container { height: calc(100% - 34px); + overflow: auto; } @media (max-width: 768px) { .openerp.openerp_webclient_container { @@ -3027,7 +3026,6 @@ top: 0px; } } - .kitten-mode-activated { background-size: cover; background-attachment: fixed; @@ -3415,7 +3413,7 @@ div.tour-backdrop { } body { - overflow: auto; + overflow: hidden; } @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e8b379ea50f..ccf6825299c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -199,6 +199,7 @@ $sheet-padding: 16px background: white &.openerp_webclient_container height: calc(100% - 34px) + overflow: auto @media (max-width: 768px) &.openerp_webclient_container height: calc(100% - 52px) @@ -2794,7 +2795,7 @@ div.tour-backdrop // }}} body - overflow: auto + overflow: hidden // hack to make IE11 work @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) |