summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Degueldre <sad@odoo.com>2019-12-24 08:02:03 +0000
committerSamuel Degueldre <sad@odoo.com>2019-12-31 13:25:21 +0000
commit6481d0b35316a21e5a182e5ec3d1bbf3814b26a4 (patch)
tree7134b46b479da4b7b0a7e79518d894af511e892c
parentde6589619beb168dbe6fc12158739eb6ad3e1a68 (diff)
[REF] website, *: remove unused class oe_custom_bg
*: web_editor, website_forum, website_mass_mailing, website_slides This class no longer does anything. Part of odoo/odoo#41561 task-2155808 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
-rw-r--r--addons/web_editor/static/src/js/editor/snippets.options.js5
-rw-r--r--addons/website/static/src/js/content/snippets.animation.js2
-rw-r--r--addons/website/views/snippets/s_banner.xml2
-rw-r--r--addons/website/views/snippets/s_carousel.xml6
-rw-r--r--addons/website/views/snippets/s_cover.xml2
-rw-r--r--addons/website/views/snippets/s_parallax.xml2
-rw-r--r--addons/website_forum/views/website_forum.xml4
-rw-r--r--addons/website_mass_mailing/views/snippets_templates.xml2
-rw-r--r--addons/website_slides/data/slide_slide_demo.xml4
9 files changed, 14 insertions, 15 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index 02692c858af..f01e3ebd310 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -2360,10 +2360,10 @@ registry.background = SnippetOptionWidget.extend({
}
if (widgetValue) {
this.$target.css('background-image', `url('${widgetValue}')`);
- this.$target.removeClass('oe_custom_bg').addClass('oe_img_bg');
+ this.$target.addClass('oe_img_bg');
} else {
this.$target.css('background-image', '');
- this.$target.removeClass('oe_img_bg oe_custom_bg');
+ this.$target.removeClass('oe_img_bg');
}
},
@@ -2421,7 +2421,6 @@ registry.background = SnippetOptionWidget.extend({
_setCustomBackground: async function (value, previewMode) {
this.__customImageSrc = value;
this.background(false, this.__customImageSrc, {});
- this.$target.toggleClass('oe_custom_bg', !!value);
await new Promise(resolve => {
// Will update the UI of the correct widgets for all options
// related to the same $target/editor
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
index f643374adf6..ec126096cdb 100644
--- a/addons/website/static/src/js/content/snippets.animation.js
+++ b/addons/website/static/src/js/content/snippets.animation.js
@@ -532,7 +532,7 @@ registry.parallax = Animation.extend({
this.$bg = this.$('> .s_parallax_bg');
if (!this.$bg.length) {
this.$bg = $('<span/>', {
- class: 's_parallax_bg' + (this.$target.hasClass('oe_custom_bg') ? ' oe_custom_bg' : ''),
+ class: 's_parallax_bg',
}).prependTo(this.$target);
}
}
diff --git a/addons/website/views/snippets/s_banner.xml b/addons/website/views/snippets/s_banner.xml
index c006c508708..e5f2f185656 100644
--- a/addons/website/views/snippets/s_banner.xml
+++ b/addons/website/views/snippets/s_banner.xml
@@ -3,7 +3,7 @@
<template id="s_banner" name="Banner">
<section class="s_banner parallax s_parallax_is_fixed pt96 pb96" data-scroll-background-ratio="1">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-7 bg-white jumbotron rounded pt32 pb32" data-name="Box">
diff --git a/addons/website/views/snippets/s_carousel.xml b/addons/website/views/snippets/s_carousel.xml
index e3337db6ab7..a989b86d836 100644
--- a/addons/website/views/snippets/s_carousel.xml
+++ b/addons/website/views/snippets/s_carousel.xml
@@ -13,7 +13,7 @@
<!-- Content -->
<div class="carousel-inner">
<!-- #01 -->
- <div class="carousel-item active oe_custom_bg oe_img_bg pt152 pb152" style="background-image: url('/web/image/website.s_carousel_default_image_1');" data-name="Slide">
+ <div class="carousel-item active oe_img_bg pt152 pb152" style="background-image: url('/web/image/website.s_carousel_default_image_1');" data-name="Slide">
<div class="container">
<div class="row content">
<div class="carousel-content col-lg-7">
@@ -30,7 +30,7 @@
</div>
</div>
<!-- #02 -->
- <div class="carousel-item oe_custom_bg oe_img_bg pt96 pb96" style="background-image: url('/web/image/website.s_carousel_default_image_2');" data-name="Slide">
+ <div class="carousel-item oe_img_bg pt96 pb96" style="background-image: url('/web/image/website.s_carousel_default_image_2');" data-name="Slide">
<div class="container">
<div class="row content">
<div class="carousel-content col-lg-8 offset-lg-2 bg-black-50 text-center pt48 pb40">
@@ -47,7 +47,7 @@
</div>
</div>
<!-- #03 -->
- <div class="carousel-item oe_custom_bg oe_img_bg pt128 pb128" style="background-image: url('/web/image/website.s_carousel_default_image_3');" data-name="Slide">
+ <div class="carousel-item oe_img_bg pt128 pb128" style="background-image: url('/web/image/website.s_carousel_default_image_3');" data-name="Slide">
<div class="container">
<div class="row content">
<div class="carousel-content col-lg-6 offset-lg-6">
diff --git a/addons/website/views/snippets/s_cover.xml b/addons/website/views/snippets/s_cover.xml
index 069b0a52f75..d0d44be7498 100644
--- a/addons/website/views/snippets/s_cover.xml
+++ b/addons/website/views/snippets/s_cover.xml
@@ -3,7 +3,7 @@
<template id="s_cover" name="Cover">
<section class="s_cover parallax s_parallax_is_fixed bg-black-50 pt96 pb96" data-scroll-background-ratio="1">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;"/>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;"/>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-12 s_title" data-name="Title">
diff --git a/addons/website/views/snippets/s_parallax.xml b/addons/website/views/snippets/s_parallax.xml
index 9fa137473fb..c24b88ff608 100644
--- a/addons/website/views/snippets/s_parallax.xml
+++ b/addons/website/views/snippets/s_parallax.xml
@@ -3,7 +3,7 @@
<template id="s_parallax" name="Parallax">
<section class="s_parallax parallax s_parallax_is_fixed bg-black-50 pt160 pb160" data-scroll-background-ratio="1">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.s_parallax_default_image'); background-position: 50% 75%;"/>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_parallax_default_image'); background-position: 50% 75%;"/>
<div class="oe_structure">
<section>
<div class="container">
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 20d464c86c5..520a57f7c14 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -51,7 +51,7 @@
<template id="header" name="Forum Index">
<t t-if="forum.active" t-call="website_forum.layout">
<section t-attf-class="s_cover parallax s_parallax_is_fixed py-3 #{forum.image_1920 and 'bg-black-50' or 'o_wforum_forum_card_bg text-white'}" data-scroll-background-ratio="1">
- <span t-if="forum.image_1920" class="s_parallax_bg oe_img_bg oe_custom_bg" t-attf-style="background-image: url('#{website.image_url(forum, 'image_1920')}'); background-position: center;"/>
+ <span t-if="forum.image_1920" class="s_parallax_bg oe_img_bg" t-attf-style="background-image: url('#{website.image_url(forum, 'image_1920')}'); background-position: center;"/>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-12 s_title" data-name="Title">
@@ -467,7 +467,7 @@
<xpath expr="//*[hasclass('oe_structure')][@id='oe_structure_forum_all_top']" position="replace">
<div class="oe_structure oe_empty" id="oe_structure_forum_all_top">
<section class="s_cover parallax s_parallax_is_fixed bg-black-50 py-5" data-scroll-background-ratio="1">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;"/>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;"/>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-12 s_title" data-name="Title">
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 6d076d07ac2..6200662243f 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -35,7 +35,7 @@
</template>
<template id="s_newsletter_block" name="Newsletter block">
- <section class="s_newsletter_block pt64 pb64 oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.library_image_17');">
+ <section class="s_newsletter_block pt64 pb64 oe_img_bg" style="background-image: url('/web/image/website.library_image_17');">
<div class="container">
<div class="row">
<div class="col-lg-7 offset-lg-5 pt32 pb32 bg-white-75">
diff --git a/addons/website_slides/data/slide_slide_demo.xml b/addons/website_slides/data/slide_slide_demo.xml
index 5c8d20cf1f7..2358cff2933 100644
--- a/addons/website_slides/data/slide_slide_demo.xml
+++ b/addons/website_slides/data/slide_slide_demo.xml
@@ -227,7 +227,7 @@
<field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/>
<field name="html_content" type="html">
<section class="s_cover parallax bg-black-50 pt16 pb16" data-scroll-background-ratio="0" style="background-image: none;">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_1.jpg'); background-position: 50% 0;"></span>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_1.jpg'); background-position: 50% 0;"></span>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-12 s_title">
@@ -464,7 +464,7 @@
<field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/>
<field name="html_content" type="html">
<section class="s_cover parallax bg-black-50 pt16 pb16" data-scroll-background-ratio="0" style="background-image: none;">
- <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_3.jpg'); background-position: 50% 0;"></span>
+ <span class="s_parallax_bg oe_img_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_3.jpg'); background-position: 50% 0;"></span>
<div class="container">
<div class="row s_nb_column_fixed">
<div class="col-lg-12 s_title">