From fa339af2e40d1ad76849d7f4e3ab283cc18649e6 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 17 Sep 2014 16:32:54 +0200 Subject: [FIX] css: move overflow auto from body to webclient to prevent some element from triggering anoter scrollbar --- addons/web/static/src/css/base.css | 8 +++----- addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/css') 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) -- cgit v1.2.3 From fd432b672572bc1e0f8999a7fd260e18884e8017 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 24 Sep 2014 11:38:25 +0200 Subject: [FIX] web: base.css: visible overflow for oe_view_manager_body on media print --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8af9a3b7359..e9a1bed9d70 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3259,6 +3259,9 @@ body.oe_single_form .oe_single_form_container { .openerp { text-shadow: none; } + .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body { + overflow: visible; + } .openerp .oe_header_row, .openerp ul.oe_header, .openerp div.oe_mail_thread_action, .openerp .oe_mail_recthread_actions, .openerp .oe_button_box, .openerp .oe_form button, .openerp button.oe_invite, .openerp .oe_form header, .openerp .openerp .oe_notebook > li.ui-state-default, .openerp .oe_topbar, .openerp .oe_leftbar, .openerp .oe_loading { display: none !important; } @@ -3294,6 +3297,10 @@ body.oe_single_form .oe_single_form_container { .openerp .openerp div.oe_mail_wall { overflow: hidden !important; } + + .openerp.openerp_webclient_container { + overflow: visible; + } } .tooltip { padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ccf6825299c..bff2928b570 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2661,6 +2661,8 @@ body.oe_single_form // @media print {{{ @media print .openerp + .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body + overflow: visible .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default, .oe_topbar, .oe_leftbar, .oe_loading // We use !important here because jQuery adds @style = display: block on elements when using $.fn.show() display: none !important @@ -2691,6 +2693,8 @@ body.oe_single_form background: none .openerp div.oe_mail_wall overflow: hidden !important + .openerp.openerp_webclient_container + overflow: visible // }}} // End of customize -- cgit v1.2.3 From aa6af7608a2ca4f1fe854430928f3e9ae96711ac Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 24 Sep 2014 15:38:14 +0200 Subject: [FIX] css: overflow-x: auto should be on modal-body --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e9a1bed9d70..b7a42f7de60 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3361,6 +3361,9 @@ body.oe_single_form .oe_single_form_container { height: 18px; font-size: 20px; } +.modal .modal-body { + overflow-x: auto; +} .modal .modal-footer { text-align: left; } @@ -3369,7 +3372,6 @@ body.oe_single_form .oe_single_form_container { } .modal .oe_act_window.modal-body { padding: 0; - overflow-x: auto; } .ui-datepicker { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bff2928b570..f330336211f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2751,13 +2751,14 @@ body.oe_single_form padding: 1px height: 18px font-size: 20px + .modal-body + overflow-x: auto .modal-footer text-align: left .oe_button margin: 0 4px 0 0 .oe_act_window.modal-body padding: 0 - overflow-x: auto .ui-datepicker z-index: 1500 !important -- cgit v1.2.3