[MERGE] forward port of branch 8.0 up to 2b192be

1 files changed, 150 insertions, 0 deletions

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index b9d7dc1fa9d..ac1397356b5 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -285,6 +285,48 @@ ul.nav-stacked > li > a
 .hr
     padding: 4px 0
 
+
+.o_image_floating
+    width: 40%
+    margin: 4px
+    div.o_container
+        position: relative
+        mark
+            display: block
+            position: absolute
+            bottom: 0
+            width: 100%
+            background-color: rgba(86,61,124,.25)
+            a
+                color: white
+    &.o_hide_link div.o_container mark
+        display: none
+    &.o_margin_s
+        margin-bottom: 4px
+        &.pull-right
+            margin-left: 8px
+        &.pull-left
+            margin-right: 8px
+    &.o_margin_m
+        margin-bottom: 8px
+        &.pull-right
+            margin-left: 12px
+        &.pull-left
+            margin-right: 12px
+    &.o_margin_l
+        margin-bottom: 12px
+        &.pull-right
+            margin-left: 16px
+        &.pull-left
+            margin-right: 16px
+    &.o_margin_xl
+        margin-bottom: 24px
+        &.pull-right
+            margin-left: 32px
+        &.pull-left
+            margin-right: 32px
+
+
 /* gallery */
 
 .o_gallery
@@ -410,6 +452,50 @@ div.carousel
             vertical-align: middle
             padding: 32px 0
 
+/* Background (kept for 8.0 compatibility) */
+
+.oe_dark
+    background: #eff8f8
+    background: rgba(200, 200, 200, 0.14)
+
+.oe_black
+    background-color: rgba(0, 0, 0, 0.9)
+    color: white
+
+.oe_green
+    background-color: #169C78
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_blue_light
+    background-color: #41b6ab
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_blue
+    background-color: #34495e
+    color: white
+
+.oe_orange
+    background-color: #f05442
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_purple
+    background-color: #b163a3
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_red
+    background-color: #9C1b31
+    color: white
+    .text-muted
+        color: #ddd
+
 /* Misc */
 
 .texttop
@@ -463,6 +549,11 @@ span[data-oe-type="monetary"]
     overflow:hidden
     text-overflow:ellipsis
 
+.oe_website_spinner
+    width: 121px
+    input
+        text-align: center
+
 div.media_iframe_video
     height: 0
     margin: 0 auto
@@ -491,3 +582,62 @@ div.media_iframe_video
         -ms-transform: none !important
         -o-transform: none !important
         transform: none !important
+
+
+/* Fix: backward compatibility saas-3 */
+
+div.carousel
+    .container
+        > .carousel-caption
+            position: absolute
+            right: 50%
+            left: 50%
+            bottom: 20px
+            > div
+                position: absolute
+                text-align: left
+                padding: 20px
+                background: rgba(0, 0, 0, 0.4)
+                bottom: 20px
+        > .carousel-image
+            top: 5%
+            bottom: 5%
+            position: absolute
+            max-height: 90%
+            margin: 0 auto
+    .item.text_image
+        .container
+            > .carousel-caption
+                left: 10%
+                > div
+                    right: 50%
+                    margin-right: -20%
+                    max-width: 550px
+            > .carousel-image
+                right: 10%
+                left: 50%
+    .item.image_text
+        .container
+            > .carousel-caption
+                right: 10%
+                > div
+                    left: 50%
+                    margin-left: -20%
+                    max-width: 550px
+            > .carousel-image
+                right: 50%
+                left: 10%
+    .item.text_only
+        .container
+            > .carousel-caption
+                left: 10%
+                right: 10%
+                top: 10%
+                bottom: auto
+                > div
+                    text-align: center
+                    background: transparent
+                    bottom: auto
+                    width: 100%
+            > .carousel-image
+                display: none !important