diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js index 0ef07ccc12e..5c1057108b6 100644 --- a/addons/website/static/src/js/editor/snippets.options.js +++ b/addons/website/static/src/js/editor/snippets.options.js @@ -1051,7 +1051,6 @@ options.registry.CoverProperties = options.Class.extend({ // Update saving dataset this.$target[0].dataset.coverClass = this.$el.find('[data-cover-opt-name="size"] we-button.active').data('selectClass') || ''; - this.$target[0].dataset.textSizeClass = this.$el.find('[data-cover-opt-name="text_size"] we-button.active').data('selectClass') || ''; this.$target[0].dataset.textAlignClass = this.$el.find('[data-cover-opt-name="text_align"] we-button.active').data('selectClass') || ''; this.$target[0].dataset.filterValue = this.$filterValueOpts.filter('.active').data('filterValue') || 0.0; this.$target[0].dataset.filterColor = this.$filterColorOpts.filter('.active').data('filterColor') || ''; diff --git a/addons/website/static/src/js/editor/wysiwyg_multizone.js b/addons/website/static/src/js/editor/wysiwyg_multizone.js index b4d7e07f9fc..392ab6046d0 100644 --- a/addons/website/static/src/js/editor/wysiwyg_multizone.js +++ b/addons/website/static/src/js/editor/wysiwyg_multizone.js @@ -151,7 +151,6 @@ var WysiwygMultizone = Wysiwyg.extend({ 'background-color': el.dataset.filterColor, 'opacity': el.dataset.filterValue, 'resize_class': el.dataset.coverClass, - 'text_size_class': el.dataset.textSizeClass, 'text_align_class': el.dataset.textAlignClass, }; diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index f22e8edda8d..14e07038be6 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -416,14 +416,6 @@ Purple Green - - Hero - Huge - Big - Regular - Small - Tiny - Left Centered diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index dd6092435dc..5008fb9634e 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -329,11 +329,10 @@
+ t-attf-class="o_record_cover_container d-flex flex-column h-100 bg-secondary #{use_size and _cp.get('resize_class')} #{use_text_align and _cp.get('text_align_class')} #{additionnal_classes}">
diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml index 1806d7fca67..8ec46c5f97a 100644 --- a/addons/website_blog/data/website_blog_demo.xml +++ b/addons/website_blog/data/website_blog_demo.xml @@ -4,12 +4,12 @@ Travel Holiday tips - {"background-image": "url('/website_blog/static/src/img/blog_1.jpeg')", "text_size_class": "o_record_cover_font_big", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0.4"} + {"background-image": "url('/website_blog/static/src/img/blog_1.jpeg')", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0.4"} Astronomy Astronomy is “stargazing" - {"background-image": "url('/website_blog/static/src/img/blog_2.jpeg')", "text_size_class": "o_record_cover_font_big", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0.4"} + {"background-image": "url('/website_blog/static/src/img/blog_2.jpeg')", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0.4"} @@ -37,7 +37,7 @@ - {"background-image": "url('/website_blog/static/src/img/cover_1.jpg')", "resize_class": "o_record_has_cover o_full_screen_height", "text_size_class": "o_record_cover_font_big", "background-color": "oe_black", "opacity": "0"} + {"background-image": "url('/website_blog/static/src/img/cover_1.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0"} Sierra Tarahumara, popularly known as Copper Canyon is situated in Mexico. The area is a favorite destination among those seeking an adventurous vacation.

Copper Canyon is one of the six gorges in the area. Although the name suggests that the gorge might have some relevance to copper mining, this is not the case. The name is derived from the copper and green lichen covering the canyon. Copper Canyon has two climatic zones. The region features an alpine climate at the top and a subtropical climate at the lower levels. Winters are cold with frequent snowstorms at the higher altitudes. Summers are dry and hot. The capital city, Chihuahua, is a high altitude desert where weather ranges from cold winters to hot summers. The region is unique because of the various ecosystems that exist within it.

@@ -72,7 +72,7 @@ - {"background-image": "url('/website_blog/static/src/img/cover_2.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "text_size_class": "o_record_cover_font_big", "background-color": "oe_blue", "opacity": "0.4"} + {"background-image": "url('/website_blog/static/src/img/cover_2.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_blue", "opacity": "0.4"}
@@ -170,7 +170,7 @@ People who live on the island have never even seen this remarkable scenery unles - {"background-image": "url('/website_blog/static/src/img/cover_4.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "text_size_class": "o_record_cover_font_big", "text_align_class": "text-center", "background-color": "oe_black", "opacity": "0.2"} + {"background-image": "url('/website_blog/static/src/img/cover_4.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "text_align_class": "text-center", "background-color": "oe_black", "opacity": "0.2"} It is safe to say that at some point on our lives, each and every one of us has that moment when we are suddenly stunned when we come face to face with the enormity of the universe that we see in the night sky.

@@ -253,7 +253,7 @@ People who live on the island have never even seen this remarkable scenery unles - {"background-image": "url('/website_blog/static/src/img/cover_6.jpg')", "resize_class": "o_record_has_cover o_full_screen_height", "text_size_class": "o_record_cover_font_huge", "text_align_class": "text-center", "background-color": "oe_black", "opacity": "0.2"} + {"background-image": "url('/website_blog/static/src/img/cover_6.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "text_align_class": "text-center", "background-color": "oe_black", "opacity": "0.2"} Buying the right telescope to take your love of astronomy to the next level is a big next step in the development of your passion for the stars.

In many ways, it is a big step from someone who is just fooling around with astronomy to a serious student of the science. But you and I both know that there is still another big step after buying a telescope before you really know how to use it.

@@ -294,7 +294,7 @@ People who live on the island have never even seen this remarkable scenery unles - {"background-image": "url('/website_blog/static/src/img/cover_7.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "text_size_class": "o_record_cover_font_big", "background-color": "oe_black", "opacity": "0.4"} + {"background-image": "url('/website_blog/static/src/img/cover_7.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "background-color": "oe_black", "opacity": "0.4"} For many of us, our very first experience of learning about the celestial bodies begins when we saw our first full moon in the sky. It is truly a magnificent view even to the naked eye.

If the night is clear, you can see amazing detail of the lunar surface just star gazing on in your back yard. diff --git a/addons/website_blog/static/src/scss/website_blog.scss b/addons/website_blog/static/src/scss/website_blog.scss index 2a64e9d3f76..8916846179b 100644 --- a/addons/website_blog/static/src/scss/website_blog.scss +++ b/addons/website_blog/static/src/scss/website_blog.scss @@ -2,29 +2,6 @@ $o-wblog-sidebar-width: 280px; $o-wblog-loader-size: 50px; -$o-wblog-title-sizes-variants: ( - tiny: ( - title: $display4-size*0.6, - subtitle: $lead-font-size - ), - small: ( - title: $display4-size*0.75, - subtitle: $lead-font-size - ), - big: ( - title: $display3-size, - subtitle: $lead-font-size*1.25 - ), - huge: ( - title: $display2-size, - subtitle: $lead-font-size*1.5 - ), - hero: ( - title: $display1-size, - subtitle: $lead-font-size*1.75 - ) -) !default; - // ======= ANIMATIONS ======= // Generic fade-in @keyframes o-wblog-fade-In { @@ -232,18 +209,6 @@ $o-wblog-title-sizes-variants: ( } } - // Size variants - @each $size, $map in $o-wblog-title-sizes-variants { - .o_record_cover_font_#{$size} .o_wblog_post_title { - #o_wblog_post_name { - @include font-size(map-get($map, title)); - } - #o_wblog_post_subtitle { - @include font-size(map-get($map, subtitle)); - } - } - } - // Refine multi-lines titles when using 'regular' cover .o_wblog_regular_cover_container #o_wblog_post_name { line-height: 1; diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 8f35bf926e3..57196daaca2 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -158,7 +158,6 @@ list of filtered posts (by date or tag). - @@ -234,7 +233,6 @@ list of filtered posts (by date or tag). -

@@ -437,7 +435,6 @@ list of filtered posts (by date or tag). diff --git a/addons/website_event/static/src/scss/website_event.scss b/addons/website_event/static/src/scss/website_event.scss index ebd7d31ce2b..4be4eeacba2 100644 --- a/addons/website_event/static/src/scss/website_event.scss +++ b/addons/website_event/static/src/scss/website_event.scss @@ -1,26 +1,3 @@ -$o-wevent-event-title-sizes-variants: ( - tiny: ( - title: $display4-size*0.6, - subtitle: $lead-font-size - ), - small: ( - title: $display4-size*0.75, - subtitle: $lead-font-size - ), - big: ( - title: $display3-size, - subtitle: $lead-font-size*1.25 - ), - huge: ( - title: $display2-size, - subtitle: $lead-font-size*1.5 - ), - hero: ( - title: $display1-size, - subtitle: $lead-font-size*1.75 - ) -) !default; - .o_wevent_event_searchbar_form { flex: 0 0 100%; @@ -193,17 +170,6 @@ $o-wevent-event-title-sizes-variants: ( } } - @each $size, $map in $o-wevent-event-title-sizes-variants { - .o_record_cover_font_#{$size} .o_wevent_event_title { - .o_wevent_event_name { - @include font-size(map-get($map, title)); - } - .o_wevent_event_subtitle { - @include font-size(map-get($map, subtitle)); - } - } - } - .o_wevent_registration_btn { flex: 0 0 100%; diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 52a9e9be649..3e56d9bc880 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -394,7 +394,6 @@ -