[MERGE] forward port of branch saas-6 up to bf1e999

4 files changed, 16 insertions, 7 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 6b631348651..b49c6a14afe 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -636,8 +636,7 @@ ul.oe_menu_editor .disclose {
 }
 .oe_ace_view_editor.oe_ace_closed {
   z-index: -1000;
-  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
-  opacity: 0;
+  display: none
 }
 
 .oe_include_bundles {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 73c000f737a..23762bb5fe4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -546,7 +546,7 @@ $infobar_height: 20px
         +opacity(0.97)
     &.oe_ace_closed
         z-index: -1000
-        +opacity(0)
+        display: none
 
 .oe_include_bundles
     font-weight: normal
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a7d05da9eed..872d82b460f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -213,6 +213,10 @@ li > p {
   margin: 0;
 }
 
+font[style*='background'], font[class*='bg-'] {
+  padding: 0 2px
+}
+
 .o_ul_toggle_self, .o_ul_toggle_next {
   display: none;
 }
@@ -342,8 +346,10 @@ body > nav.navbar {
   z-index: 10000;
 }
 
-nav.navbar + #wrapwrap {
-  padding-top: 34px;
+@media (min-width: 767px) {
+  nav.navbar + #wrapwrap {
+    padding-top: 34px;
+  }
 }
 
 /* ----- BOOTSTRAP FIX ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 022b07066ad..223bab94a0b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -130,6 +130,9 @@ li > * > li > * > li > * > li > * > li > * > li > ol
 li > p
     margin: 0
 
+font[style*='background'], font[class*='bg-']
+    padding: 0 2px
+
 .o_ul_toggle_self, .o_ul_toggle_next
     display: none
 .o_ul_folded
@@ -238,8 +241,9 @@ body > nav.navbar
     width: 100%
     position: absolute
     z-index: 10000
-nav.navbar + #wrapwrap
-    padding-top: 34px
+@media (max-min: 767px)
+    nav.navbar + #wrapwrap
+        padding-top: 34px
 
 /* ----- BOOTSTRAP FIX ----- */