4 files changed, 39 insertions, 14 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 4a24b907b46..4b2dca452cd 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -68,10 +68,21 @@
   display: none;
 }
 
-.o_editable[data-oe-model][data-oe-type]:hover {
-  -moz-box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8);
-  -webkit-box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8);
-  box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8);
+.o_editable:not(:empty):not(:focus):hover, .o_editable[data-oe-type]:not(:focus):hover {
+  -moz-box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset;
+  -webkit-box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset;
+  box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset;
+}
+.o_editable:focus, .o_editable[data-oe-type] {
+  min-height: 0.8em;
+  min-width: 8px;
+}
+.o_editable.o_is_inline_editable {
+  display: inline-block;
+}
+
+.editor_enable [data-oe-readonly]:hover {
+  cursor: default;
 }
 
 /* Prevent the text contents of draggable elements from being selectable. */
@@ -155,7 +166,7 @@
   display: none;
 }
 
-.o_editable .css_non_editable_mode_hidden {
+.editor_enable .css_non_editable_mode_hidden {
   display: block !important;
 }
 
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8465df4a6e9..73b04009833 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -62,10 +62,19 @@
     .arrow
         display: none
 
-.o_editable[data-oe-model][data-oe-type]:hover
-    -moz-box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8)
-    -webkit-box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8)
-    box-shadow: 0 0 10px 3px rgba(94, 255, 0, 0.8)
+.o_editable
+    &:not(:empty),&[data-oe-type]
+        &:not(:focus):hover
+            -moz-box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset
+            -webkit-box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset
+            box-shadow: rgba(94, 255, 0, 0.8) 0 0 5px 2px inset
+    &:focus,&[data-oe-type]
+        min-height: 0.8em
+        min-width: 8px
+    &.o_is_inline_editable
+        display: inline-block
+.editor_enable [data-oe-readonly]:hover
+    cursor: default
 
 // }}}
 
@@ -133,7 +142,7 @@
 .o_editable .css_editable_mode_hidden
     display: none
 
-.o_editable .css_non_editable_mode_hidden
+.editor_enable .css_non_editable_mode_hidden
     display: block !important
 
 .o_editable .media_iframe_video .css_editable_mode_display
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index cacf74d4108..43807b7a76b 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -296,7 +296,6 @@ html, body, #wrapwrap {
 }
 #wrapwrap > footer {
   height: 100%;
-  background: #eff8f8;
   background: rgba(200, 200, 200, 0.1);
 }
 
@@ -827,6 +826,12 @@ span[data-oe-type="monetary"] {
   margin: 40px auto;
 }
 
+.oe_website_overflow_ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .oe_website_spinner {
   width: 121px;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 23f69baf0b0..f937379b81e 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -660,9 +660,9 @@ span[data-oe-type="monetary"]
     margin: 40px auto
 
 .oe_website_overflow_ellipsis
-    white-space:nowrap
-    overflow:hidden
-    text-overflow:ellipsis
+    white-space: nowrap
+    overflow: hidden
+    text-overflow: ellipsis
 
 .oe_website_spinner
     width: 121px