diff --git a/theme_real_estate/__manifest__.py b/theme_real_estate/__manifest__.py index d5bd1480e..573fa66f1 100644 --- a/theme_real_estate/__manifest__.py +++ b/theme_real_estate/__manifest__.py @@ -13,6 +13,7 @@ 'views/snippets/s_cta_box.xml', 'views/snippets/s_banner.xml', + 'views/snippets/s_cover.xml', 'views/snippets/s_picture.xml', 'views/snippets/s_cards_grid.xml', 'views/snippets/s_striped_top.xml', @@ -30,6 +31,7 @@ 'views/snippets/s_features_wall.xml', 'views/snippets/s_masonry_block.xml', 'views/snippets/s_numbers.xml', + 'views/snippets/s_references.xml', 'views/snippets/s_title.xml', 'views/snippets/s_image_gallery.xml', 'views/snippets/s_striped_center_top.xml', @@ -54,18 +56,16 @@ 'static/description/real_estate_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_banner_default_image': '/theme_real_estate/static/src/img/snippets/s_banner.jpg', + 'website.s_cover_default_image': '/theme_real_estate/static/src/img/snippets/s_cover.jpg', 'website.s_text_image_default_image': '/theme_real_estate/static/src/img/snippets/s_text_image.jpg', 'website.s_image_text_default_image': '/theme_real_estate/static/src/img/snippets/s_image_text.jpg', 'website.s_three_columns_default_image_1': '/theme_real_estate/static/src/img/snippets/library_image_11.jpg', 'website.s_three_columns_default_image_2': '/theme_real_estate/static/src/img/snippets/library_image_13.jpg', 'website.s_three_columns_default_image_3': '/theme_real_estate/static/src/img/snippets/library_image_07.jpg', - 'website.s_masonry_block_default_image_1': '/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg', - 'website.s_quotes_carousel_demo_image_1': '/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg', + 'website.s_quotes_carousel_demo_image_0': '/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg', }, 'configurator_snippets': { - 'homepage': ['s_banner', 's_text_block', 's_text_image', 's_image_text', 's_title', 's_three_columns', - 's_title', 's_masonry_block', 's_numbers', 's_quotes_carousel'], + 'homepage': ['s_cover', 's_text_image', 's_image_text', 's_three_columns', 's_title', 's_references', 's_numbers_showcase', 's_quotes_carousel', 's_call_to_action'], }, 'new_page_templates': { 'about': { diff --git a/theme_real_estate/static/description/real_estate_description.png b/theme_real_estate/static/description/real_estate_description.png index 3ca6e9485..ed66e6175 100644 Binary files a/theme_real_estate/static/description/real_estate_description.png and b/theme_real_estate/static/description/real_estate_description.png differ diff --git a/theme_real_estate/static/description/real_estate_screenshot.jpg b/theme_real_estate/static/description/real_estate_screenshot.jpg index 92d21f11b..21c3c1b91 100644 Binary files a/theme_real_estate/static/description/real_estate_screenshot.jpg and b/theme_real_estate/static/description/real_estate_screenshot.jpg differ diff --git a/theme_real_estate/static/description/theme_real_estate.svg b/theme_real_estate/static/description/theme_real_estate.svg index 0ff415930..1ea09003e 100644 --- a/theme_real_estate/static/description/theme_real_estate.svg +++ b/theme_real_estate/static/description/theme_real_estate.svg @@ -1,291 +1,343 @@ - + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_real_estate/static/src/img/snippets/s_banner.jpg b/theme_real_estate/static/src/img/snippets/s_banner.jpg index d00ca7d01..31138758d 100644 Binary files a/theme_real_estate/static/src/img/snippets/s_banner.jpg and b/theme_real_estate/static/src/img/snippets/s_banner.jpg differ diff --git a/theme_real_estate/static/src/img/snippets/s_cover.jpg b/theme_real_estate/static/src/img/snippets/s_cover.jpg index 47cc84ada..d00ca7d01 100644 Binary files a/theme_real_estate/static/src/img/snippets/s_cover.jpg and b/theme_real_estate/static/src/img/snippets/s_cover.jpg differ diff --git a/theme_real_estate/static/src/img/snippets/s_image_text.jpg b/theme_real_estate/static/src/img/snippets/s_image_text.jpg index fd57d28af..7b61be4db 100644 Binary files a/theme_real_estate/static/src/img/snippets/s_image_text.jpg and b/theme_real_estate/static/src/img/snippets/s_image_text.jpg differ diff --git a/theme_real_estate/static/src/js/tour.js b/theme_real_estate/static/src/js/tour.js index 253e5ac2e..6b9a4d04f 100644 --- a/theme_real_estate/static/src/js/tour.js +++ b/theme_real_estate/static/src/js/tour.js @@ -4,29 +4,19 @@ import * as wTourUtils from "@website/js/tours/tour_utils"; const snippets = [ { - id: 's_banner', - name: 'Banner', + id: 's_cover', + name: 'Cover', groupName: "Intro", }, - { - id: 's_text_block', - name: 'Text', - groupName: "Text", - }, - { - id: 's_text_image', - name: 'Text - Image', - groupName: "Content", - }, { id: 's_image_text', name: 'Image - Text', groupName: "Content", }, { - id: 's_title', - name: 'Title', - groupName: "Text", + id: 's_image_text', + name: 'Image - Text', + groupName: "Content", }, { id: 's_three_columns', @@ -39,13 +29,13 @@ const snippets = [ groupName: "Text", }, { - id: 's_masonry_block', - name: 'Masonry', - groupName: "Images", + id: 's_references', + name: 'References', + groupName: "People", }, { - id: 's_numbers', - name: 'Numbers', + id: 's_numbers_showcase', + name: 'Numbers Showcase', groupName: "Content", }, { @@ -53,10 +43,15 @@ const snippets = [ name: 'Quotes', groupName: "People", }, + { + id: 's_call_to_action', + name: 'Call To Action', + groupName: "Content", + }, ]; wTourUtils.registerThemeHomepageTour("real_estate_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"real-estate-4"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-28"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1'), wTourUtils.goBackToBlocks(), diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss index 668df7c74..7c814fdc5 100644 --- a/theme_real_estate/static/src/scss/primary_variables.scss +++ b/theme_real_estate/static/src/scss/primary_variables.scss @@ -66,36 +66,34 @@ $o-theme-font-configs: ( 'family': ('Playfair Display SC', serif), 'url': 'Playfair+Display+SC:300,300i,400,400i,700,700i', ), + 'IBM Plex Sans': ( + 'family': ('IBM Plex Sans', sans-serif), + 'url': 'IBM+Plex+Sans:300,300i,400,400i,700,700i', + ), ); -$o-theme-h1-font-size-multiplier: (62 / 16); -$o-theme-h2-font-size-multiplier: (36 / 16); -$o-theme-h3-font-size-multiplier: (24 / 16); -$o-theme-h4-font-size-multiplier: (20 / 16); -$o-theme-h5-font-size-multiplier: (18 / 16); - //------------------------------------------------------------------------------ // Website customizations //------------------------------------------------------------------------------ - -$btn-font-weight: 500; - $o-website-values-palettes: ( ( - 'color-palettes-name': 'real-estate-4', + 'color-palettes-name': 'default-28', // Font 'font': 'Roboto', + 'headings-font': 'IBM Plex Sans', // Buttons 'btn-border-radius': 0px, 'btn-border-radius-sm': 0px, 'btn-border-radius-lg': 0px, + 'btn-padding-y-lg': 0.75rem, + 'btn-padding-x-lg': 1.75rem, 'btn-ripple': true, ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'real-estate-4'); +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28'); $o-color-palettes-compatibility-indexes: ( 1: 'real-estate-1', diff --git a/theme_real_estate/views/new_page_template.xml b/theme_real_estate/views/new_page_template.xml index a550fa7b1..8bd9b9036 100644 --- a/theme_real_estate/views/new_page_template.xml +++ b/theme_real_estate/views/new_page_template.xml @@ -11,15 +11,6 @@ - -
- - - -