[FIX] css fixes (ie10) (web client)

2 files changed, 12 insertions, 11 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6478289f2b3..a7d31d8c453 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -83,6 +83,7 @@
 }
 .openerp.openerp_webclient_container {
   height: calc(100% - 34px);
+  display: -ms-flexbox;
   display: flex;
 }
 @media (max-width: 768px) {
@@ -798,9 +799,12 @@
   display: none;
 }
 .openerp .oe_leftbar {
+  display: -ms-flexbox;
   display: flex;
+  -ms-flex-direction: column;
   flex-direction: column;
   justify-content: space-between;
+  -ms-flex: 1 0 auto;
   flex-shrink: 0;
   width: 220px;
   background: #f0eeee;
@@ -809,6 +813,7 @@
 }
 .openerp .oe_leftbar a.oe_logo {
   text-align: center;
+  flex-shrink: 0;
 }
 .openerp .oe_leftbar a.oe_logo img {
   margin: 14px 0;
@@ -972,6 +977,7 @@
   height: 100%;
   width: 100%;
   flex-grow: 1;
+  -ms-flex-negative: 1;
 }
 .openerp .oe-view-manager {
   width: 100%;
@@ -3082,9 +3088,3 @@ div.tour-backdrop {
 body {
   overflow: hidden;
 }
-
-@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-  .oe_secondary_menus_container {
-    position: static !important;
-  }
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 531ef54512c..a57ef272ee6 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)
+        display: -ms-flexbox
         display: flex
     @media (max-width: 768px)
         &.openerp_webclient_container
@@ -705,9 +706,12 @@ $sheet-padding: 16px
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
+        display: -ms-flexbox
         display: flex
+        -ms-flex-direction: column
         flex-direction: column
         justify-content: space-between
+        -ms-flex: 1 0 auto
         flex-shrink: 0
         width: 220px
         background: #f0eeee
@@ -715,6 +719,7 @@ $sheet-padding: 16px
         position: relative
         a.oe_logo
             text-align: center
+            flex-shrink: 0
             img
                 margin: 14px 0
                 border: 0
@@ -847,6 +852,7 @@ $sheet-padding: 16px
         height: 100%
         width: 100%
         flex-grow: 1
+        -ms-flex-negative: 1
     // }}}
     // ViewManager common {{{
     .oe-view-manager
@@ -2538,11 +2544,6 @@ div.tour-backdrop
 body
     overflow: hidden
 
-// hack to make IE11 work
-@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) 
-    .oe_secondary_menus_container 
-        position: static !important
-
 
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"