diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-10-24 10:29:01 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-10-29 08:38:18 +0100 |
| commit | 1ccd87a03753c69a2e12c585de388434ef9ff557 (patch) | |
| tree | c49e53be2bda182422217299228fe8d0178f4798 /addons/web/static/src/css | |
| parent | eb521562cd6eee2d2a0ce15b8abb89505799bb98 (diff) | |
[FIX] fix various display problems with ie11, ie10, ie9
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 35 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 31 |
2 files changed, 62 insertions, 4 deletions
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 <afile> > "%:p:r.css" |
