From 1ccd87a03753c69a2e12c585de388434ef9ff557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 24 Oct 2014 10:29:01 +0200 Subject: [PATCH] [FIX] fix various display problems with ie11, ie10, ie9 --- addons/mail/static/src/css/mail.css | 5 +++ addons/web/static/src/css/base.css | 35 ++++++++++++++++++-- addons/web/static/src/css/base.sass | 31 +++++++++++++++-- addons/web_kanban/static/src/css/kanban.css | 8 ----- addons/web_kanban/static/src/css/kanban.sass | 6 ---- 5 files changed, 67 insertions(+), 18 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index b822366c73a..ad03e0c0674 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -743,3 +743,8 @@ .oe_mail_wall .oe-groupby-menu, .oe_mail_wall .add-to-dashboard { display: none; } + +.oe-view-manager-content .oe_mail { + display: inline-block !important; + position: relative !important; +} \ No newline at end of file diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a7d31d8c453..579c7a61d26 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -804,12 +804,16 @@ -ms-flex-direction: column; flex-direction: column; justify-content: space-between; - -ms-flex: 1 0 auto; + -ms-flex: 0 0 auto; flex-shrink: 0; + flex-grow: 0; width: 220px; + height: 100%; background: #f0eeee; border-right: 1px solid #afafb6; position: relative; + display: inline-block\9; + vertical-align: top\9; } .openerp .oe_leftbar a.oe_logo { text-align: center; @@ -975,9 +979,14 @@ } .openerp .oe_application { height: 100%; - width: 100%; flex-grow: 1; -ms-flex-negative: 1; + display: inline-block\9; + overflow: auto\9; + width: calc(100% - 220px); +} +.openerp .oe_application .oe_application { + width: 100%; } .openerp .oe-view-manager { width: 100%; @@ -990,6 +999,19 @@ flex-grow: 1; position: relative; } +.openerp .oe-view-manager .oe-view-manager-content > div { + position: absolute; + position: static\9; + top: 0; + bottom: 0; + right: 0; + left: 0; + display: none; +} +.openerp .oe-view-manager .oe-view-manager-content .oe-view-manager-content > div { + position: relative; + display: block; +} .openerp .oe-view-manager .oe-view-manager-debug { margin-right: 5px; } @@ -3088,3 +3110,12 @@ div.tour-backdrop { body { overflow: hidden; } + +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + .oe-view-manager-content > div { + position: absolute !important; + } + .oe-view-manager-content .oe-view-manager-content > div { + position: relative !important; + } +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a57ef272ee6..8a02cf43bc9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -711,12 +711,16 @@ $sheet-padding: 16px -ms-flex-direction: column flex-direction: column justify-content: space-between - -ms-flex: 1 0 auto + -ms-flex: 0 0 auto flex-shrink: 0 + flex-grow: 0 width: 220px + height: 100% background: #f0eeee border-right: 1px solid $tag-border position: relative + display: inline-block\9 + vertical-align: top\9 a.oe_logo text-align: center flex-shrink: 0 @@ -850,9 +854,13 @@ $sheet-padding: 16px text-decoration: underline .oe_application height: 100% - width: 100% flex-grow: 1 -ms-flex-negative: 1 + display: inline-block\9 + overflow: auto\9 + width: calc(100% - 220px) + .oe_application + width: 100% // }}} // ViewManager common {{{ .oe-view-manager @@ -864,6 +872,18 @@ $sheet-padding: 16px overflow: auto flex-grow: 1 position: relative + > div + position: absolute + position: static\9 + top: 0 + bottom: 0 + right: 0 + left: 0 + display: none + .oe-view-manager-content + > div + position: relative + display: block .oe-view-manager-debug margin-right: 5px .oe-view-manager-header @@ -2544,6 +2564,13 @@ div.tour-backdrop body overflow: hidden +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) + .oe-view-manager-content + > div + position: absolute !important + .oe-view-manager-content + > div + position: relative !important // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index bdc4ff859af..848557dff61 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,11 +1,3 @@ -.oe-view-manager-view-kanban { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - .ui-tabs .oe-view-manager-view-kanban { position: static; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index ff001b186d8..87b66c815d0 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -46,12 +46,6 @@ transition: $transition // }}} -.oe-view-manager-view-kanban - position: absolute - top: 0 - bottom: 0 - left: 0 - right: 0 .ui-tabs .oe-view-manager-view-kanban position: static