23 files changed, 14 insertions, 0 deletions

diff --git a/addons/website/static/src/img/aqua.jpg b/addons/website/static/src/img/aqua.jpg
deleted file mode 100644
index 47ce77005d4..00000000000
--- a/addons/website/static/src/img/aqua.jpg
+++ /dev/null
diff --git a/addons/website/static/src/img/banner/aqua.jpg b/addons/website/static/src/img/backgrounds/aqua.jpg
index 23f4bb820db..23f4bb820db 100644
--- a/addons/website/static/src/img/banner/aqua.jpg
+++ b/addons/website/static/src/img/backgrounds/aqua.jpg
diff --git a/addons/website/static/src/img/banner/baby_blue.jpg b/addons/website/static/src/img/backgrounds/baby_blue.jpg
index d13c6683c1d..d13c6683c1d 100644
--- a/addons/website/static/src/img/banner/baby_blue.jpg
+++ b/addons/website/static/src/img/backgrounds/baby_blue.jpg
diff --git a/addons/website/static/src/img/banner/black.jpg b/addons/website/static/src/img/backgrounds/black.jpg
index 800d529d032..800d529d032 100644
--- a/addons/website/static/src/img/banner/black.jpg
+++ b/addons/website/static/src/img/backgrounds/black.jpg
diff --git a/addons/website/static/src/img/banner/business_guy.jpg b/addons/website/static/src/img/backgrounds/business_guy.jpg
index 04551e6ae01..04551e6ae01 100644
--- a/addons/website/static/src/img/banner/business_guy.jpg
+++ b/addons/website/static/src/img/backgrounds/business_guy.jpg
diff --git a/addons/website/static/src/img/banner/color_splash.jpg b/addons/website/static/src/img/backgrounds/color_splash.jpg
index a16cf2367ca..a16cf2367ca 100644
--- a/addons/website/static/src/img/banner/color_splash.jpg
+++ b/addons/website/static/src/img/backgrounds/color_splash.jpg
diff --git a/addons/website/static/src/img/banner/flower.jpg b/addons/website/static/src/img/backgrounds/flower.jpg
index ed33976aa38..ed33976aa38 100644
--- a/addons/website/static/src/img/banner/flower.jpg
+++ b/addons/website/static/src/img/backgrounds/flower.jpg
diff --git a/addons/website/static/src/img/banner/flower_field.jpg b/addons/website/static/src/img/backgrounds/flower_field.jpg
index 23bf90844b7..23bf90844b7 100644
--- a/addons/website/static/src/img/banner/flower_field.jpg
+++ b/addons/website/static/src/img/backgrounds/flower_field.jpg
diff --git a/addons/website/static/src/img/banner/greenfields.jpg b/addons/website/static/src/img/backgrounds/greenfields.jpg
index 205406d24d4..205406d24d4 100644
--- a/addons/website/static/src/img/banner/greenfields.jpg
+++ b/addons/website/static/src/img/backgrounds/greenfields.jpg
diff --git a/addons/website/static/src/img/banner/landscape.jpg b/addons/website/static/src/img/backgrounds/landscape.jpg
index 08a7f233cdd..08a7f233cdd 100644
--- a/addons/website/static/src/img/banner/landscape.jpg
+++ b/addons/website/static/src/img/backgrounds/landscape.jpg
diff --git a/addons/website/static/src/img/banner/mango.jpg b/addons/website/static/src/img/backgrounds/mango.jpg
index 7582d4f548e..7582d4f548e 100644
--- a/addons/website/static/src/img/banner/mango.jpg
+++ b/addons/website/static/src/img/backgrounds/mango.jpg
diff --git a/addons/website/static/src/img/banner/mountains.jpg b/addons/website/static/src/img/backgrounds/mountains.jpg
index 7ea1ea48000..7ea1ea48000 100644
--- a/addons/website/static/src/img/banner/mountains.jpg
+++ b/addons/website/static/src/img/backgrounds/mountains.jpg
diff --git a/addons/website/static/src/img/banner/orange_red.jpg b/addons/website/static/src/img/backgrounds/orange_red.jpg
index 3f7b2ebeaa9..3f7b2ebeaa9 100644
--- a/addons/website/static/src/img/banner/orange_red.jpg
+++ b/addons/website/static/src/img/backgrounds/orange_red.jpg
diff --git a/addons/website/static/src/img/parallax/parallax_bg.jpg b/addons/website/static/src/img/backgrounds/parallax_flowers.jpg
index b4d56d7f23a..b4d56d7f23a 100644
--- a/addons/website/static/src/img/parallax/parallax_bg.jpg
+++ b/addons/website/static/src/img/backgrounds/parallax_flowers.jpg
diff --git a/addons/website/static/src/img/parallax/parallax_photo1.jpg b/addons/website/static/src/img/backgrounds/parallax_girl.jpg
index c82dfcb9406..c82dfcb9406 100644
--- a/addons/website/static/src/img/parallax/parallax_photo1.jpg
+++ b/addons/website/static/src/img/backgrounds/parallax_girl.jpg
diff --git a/addons/website/static/src/img/parallax/quote.png b/addons/website/static/src/img/backgrounds/parallax_quote.png
index 842d820eb50..842d820eb50 100644
--- a/addons/website/static/src/img/parallax/quote.png
+++ b/addons/website/static/src/img/backgrounds/parallax_quote.png
diff --git a/addons/website/static/src/img/banner/velour.jpg b/addons/website/static/src/img/backgrounds/velour.jpg
index 8a6b034b815..8a6b034b815 100644
--- a/addons/website/static/src/img/banner/velour.jpg
+++ b/addons/website/static/src/img/backgrounds/velour.jpg
diff --git a/addons/website/static/src/img/banner/wood.jpg b/addons/website/static/src/img/backgrounds/wood.jpg
index 4554794ff19..4554794ff19 100644
--- a/addons/website/static/src/img/banner/wood.jpg
+++ b/addons/website/static/src/img/backgrounds/wood.jpg
diff --git a/addons/website/static/src/img/banner/yellow_green.jpg b/addons/website/static/src/img/backgrounds/yellow_green.jpg
index 4d98768e8b0..4d98768e8b0 100644
--- a/addons/website/static/src/img/banner/yellow_green.jpg
+++ b/addons/website/static/src/img/backgrounds/yellow_green.jpg
diff --git a/addons/website/static/src/img/content_here.png b/addons/website/static/src/img/content_here.png
deleted file mode 100644
index 3f35d88d5ce..00000000000
--- a/addons/website/static/src/img/content_here.png
+++ /dev/null
diff --git a/addons/website/static/src/img/banner/banner_picture.png b/addons/website/static/src/img/library/banner_picture.png
index 85d6db907e1..85d6db907e1 100644
--- a/addons/website/static/src/img/banner/banner_picture.png
+++ b/addons/website/static/src/img/library/banner_picture.png
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 8afcab6b506..6bf0e805fec 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -147,7 +147,10 @@ options.registry.carousel = options.registry.slider.extend({
         this.$target.on('slid.bs.carousel', function () {
             if(self.editor && self.editor.styles.background) {
                 self.editor.styles.background.$target = self.$target.find(".item.active");
+                self.editor.styles.background_position.$target = self.editor.styles.background.$target;
                 self.editor.styles.background.set_active();
+                self.editor.styles.background_position.set_active();
+                self.editor.styles.background.$target.trigger("snippet-option-change", [self.editor.styles.background]);
             }
             self.$target.carousel("pause");
         });
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less
index f9fa1b6cbf2..173bd9335fd 100644
--- a/addons/website/static/src/less/website.snippets.less
+++ b/addons/website/static/src/less/website.snippets.less
@@ -9,6 +9,17 @@
     }
 }
 
+// "Cover" snippet
+@s_text_block_image_fw-padding: 0 30px;
+.s_text_block_image_fw {
+    .container {
+        padding: @s_text_block_image_fw-padding;
+        > .row > div {
+            padding: 30px;
+        }
+    }
+}
+
 // Table Snippet
 .table_desc {
     margin: 0 0 20px 0;