summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.snippets.animation.js4
-rw-r--r--addons/website/static/src/js/website.snippets.editor.js4
-rw-r--r--addons/website/static/src/less/website.snippets.less1
3 files changed, 6 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index ed4b810179c..0a1cd2e2923 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -328,7 +328,9 @@ animation.registry.parallax = animation.Class.extend({
if (!this.$bg || !this.$bg.length) {
this.$bg = this.$("> .s_parallax_bg");
if (!this.$bg.length) {
- this.$bg = $("<span/>", {"class": "s_parallax_bg"}).prependTo(this.$target);
+ this.$bg = $('<span/>', {
+ class: 's_parallax_bg' + (this.$target.hasClass('oe_custom_bg') ? ' oe_custom_bg' : ''),
+ }).prependTo(this.$target);
}
}
var urlTarget = this.$target.css("background-image");
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 083ed195905..0ec8ba7caa7 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -233,6 +233,9 @@ options.registry.carousel = options.registry.slider.extend({
s_option.$target = self.$target.find(".item.active");
s_option.set_active();
s_option.$target.trigger("snippet-option-change", [s_option]);
+ if (opt_name === 'background') {
+ s_option.bind_bg_events();
+ }
});
});
this.$target.trigger('slid.bs.carousel');
@@ -347,7 +350,6 @@ options.registry.parallax = options.Class.extend({
_refresh: function () {
_.defer((function () {
this.$target.data("snippet-view")._rebuild();
- this._update_target_to_bg();
}).bind(this));
},
_toggle_refresh_callback: function (on) {
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less
index cde2501e605..0544bb847dd 100644
--- a/addons/website/static/src/less/website.snippets.less
+++ b/addons/website/static/src/less/website.snippets.less
@@ -407,7 +407,6 @@ div.carousel {
background-size: cover;
background-attachment: scroll;
pointer-events: none;
- z-index: -1;
}
&.s_parallax_is_fixed > .s_parallax_bg {
background-attachment: fixed;