[MERGE] forward port of branch 8.0 up to a5419ca

4 files changed, 30 insertions, 5 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index ac7ddbbccb5..49adbc3ff99 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -163,6 +163,23 @@ table.editorbar-panel td.selected {
   background-color: #b1c9d9;
 }
 
+.link-style .dropdown > .btn {
+  min-width: 160px;
+}
+.link-style .link-style {
+  display: none;
+}
+.link-style li {
+  text-align: center;
+}
+.link-style li label {
+  width: 100px;
+  margin: 0 5px;
+}
+.link-style .col-sm-2 > * {
+  line-height: 2em;
+}
+
 /* ---- TRANSLATIONS ---- {{{ */
 .oe_translate_or {
   color: white;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 802b6299545..89a60f5b919 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -134,6 +134,19 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
+.link-style
+    .dropdown > .btn
+        min-width: 160px
+    .link-style
+        display: none
+    li
+        text-align: center
+        label
+            width: 100px
+            margin: 0 5px
+    .col-sm-2 > *
+        line-height: 2em
+
 // }}}
 
 /* ---- TRANSLATIONS ---- {{{ */
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 2bcbf0878ef..778c67e185a 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -104,10 +104,6 @@
 }
 .oe_snippet .oe_snippet_thumbnail .oe_snippet_thumbnail_img {
   height: 74px;
-  -webkit-transition: all 150ms linear;
-  -moz-transition: all 150ms linear;
-  -o-transition: all 150ms linear;
-  transition: all 150ms linear;
   -webkit-box-shadow: inset 0px 0px 0px 3px #333333;
   -moz-box-shadow: inset 0px 0px 0px 3px #333333;
   box-shadow: inset 0px 0px 0px 3px #333333;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index f065468c0db..868292ba558 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -81,7 +81,6 @@
             +text-shadow(0 0 2px rgb(0,0,0))
         .oe_snippet_thumbnail_img
             height: 74px
-            @include transition(all 150ms linear)
             +box-shadow(inset 0px 0px 0px 3px #333333)
             @include transform( scale(1,1))
         span, div