diff --git a/theme_orchid/__manifest__.py b/theme_orchid/__manifest__.py index cb54ca516f..864f65af94 100644 --- a/theme_orchid/__manifest__.py +++ b/theme_orchid/__manifest__.py @@ -4,7 +4,7 @@ 'category': 'Theme/Retail', 'summary': 'Florist, Gardens, Flowers, Nature, Green, Beauty, Stores', 'sequence': 230, - 'version': '2.0.0', + 'version': '3.0.0', 'depends': ['theme_common'], 'data': [ 'data/generate_primary_template.xml', @@ -17,12 +17,15 @@ 'views/snippets/s_striped_top.xml', 'views/snippets/s_card_offset.xml', 'views/snippets/s_text_image.xml', + 'views/snippets/s_title.xml', 'views/snippets/s_motto.xml', 'views/snippets/s_image_text.xml', 'views/snippets/s_image_punchy.xml', 'views/snippets/s_image_title.xml', + 'views/snippets/s_images_wall.xml', 'views/snippets/s_images_mosaic.xml', 'views/snippets/s_three_columns.xml', + 'views/snippets/s_image_text_overlap.xml', 'views/snippets/s_quotes_carousel.xml', 'views/snippets/s_carousel_intro.xml', 'views/snippets/s_quotes_carousel_minimal.xml', @@ -30,8 +33,10 @@ 'views/snippets/s_call_to_action.xml', 'views/snippets/s_freegrid.xml', 'views/snippets/s_company_team_shapes.xml', + 'views/snippets/s_company_team_basic.xml', 'views/snippets/s_numbers.xml', 'views/snippets/s_pricelist_boxed.xml', + 'views/snippets/s_process_steps.xml', 'views/snippets/s_media_list.xml', 'views/snippets/s_framed_intro.xml', 'views/snippets/s_product_catalog.xml', @@ -42,10 +47,12 @@ 'views/snippets/s_image_hexagonal.xml', 'views/snippets/s_striped_center_top.xml', 'views/snippets/s_key_images.xml', + 'views/snippets/s_kickoff.xml', 'views/snippets/s_intro_pill.xml', 'views/snippets/s_big_number.xml', 'views/snippets/s_wavy_grid.xml', 'views/snippets/s_shape_image.xml', + 'views/snippets/s_references.xml', 'views/snippets/s_empowerment.xml', 'views/new_page_template.xml', ], @@ -55,14 +62,9 @@ ], 'images_preview_theme': { 'website.s_cover_default_image': '/theme_orchid/static/src/img/snippets/s_parallax.jpg', - 'website.s_image_text_default_image': '/theme_orchid/static/src/img/snippets/s_carousel_2.jpg', - 'website.s_text_image_default_image': '/theme_orchid/static/src/img/snippets/s_media_list_3.jpg', - 'website.s_three_columns_default_image_1': '/theme_orchid/static/src/img/snippets/library_image_11.jpg', - 'website.s_three_columns_default_image_2': '/theme_orchid/static/src/img/snippets/library_image_13.jpg', - 'website.s_three_columns_default_image_3': '/theme_orchid/static/src/img/snippets/library_image_07.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_image_text', 's_text_image', 's_three_columns', 's_quotes_carousel', 's_call_to_action'], + 'homepage': ['s_kickoff', 's_key_images', 's_process_steps', 's_freegrid', 's_image_text_overlap', 's_company_team_basic', 's_title', 's_images_wall', 's_references'], }, 'new_page_templates': { 'about': { diff --git a/theme_orchid/data/ir_asset.xml b/theme_orchid/data/ir_asset.xml index 6426ad95ad..5b0f32b899 100644 --- a/theme_orchid/data/ir_asset.xml +++ b/theme_orchid/data/ir_asset.xml @@ -8,14 +8,6 @@ theme_orchid/static/src/scss/primary_variables.scss - - theme_orchid.bootstrap_overridden_scss - Bootstrap overridden SCSS - web._assets_frontend_helpers - prepend - theme_orchid/static/src/scss/bootstrap_overridden.scss - - theme_orchid.compatibility_saas_11_4_variables_scss Compatibility saas 11 4 variables SCSS diff --git a/theme_orchid/static/description/orchid_screenshot.jpg b/theme_orchid/static/description/orchid_screenshot.jpg old mode 100644 new mode 100755 index 4c76fe1bc6..2eaf343e1d Binary files a/theme_orchid/static/description/orchid_screenshot.jpg and b/theme_orchid/static/description/orchid_screenshot.jpg differ diff --git a/theme_orchid/static/description/theme_orchid.svg b/theme_orchid/static/description/theme_orchid.svg index dcb12ba8f5..2320d2d6d3 100644 --- a/theme_orchid/static/description/theme_orchid.svg +++ b/theme_orchid/static/description/theme_orchid.svg @@ -1,284 +1,309 @@ - + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + Entry Title + + + 01 + + + 02 + + + 03 + + + 04 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + Section Title + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Section Title + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + Welcome Message + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + + Entry Title + + + 1 + + + 2 + + + 3 + + + 4 + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + + + + Section Title + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Section Title + + + + + + + DISCOVER + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/theme_orchid/static/src/img/snippets/configurator_s_image_text_overlap.jpg b/theme_orchid/static/src/img/snippets/configurator_s_image_text_overlap.jpg new file mode 100644 index 0000000000..d66c1bbc7c Binary files /dev/null and b/theme_orchid/static/src/img/snippets/configurator_s_image_text_overlap.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_carousel_3.jpg b/theme_orchid/static/src/img/snippets/s_carousel_3.jpg index cc2eb6f81a..dd70432103 100644 Binary files a/theme_orchid/static/src/img/snippets/s_carousel_3.jpg and b/theme_orchid/static/src/img/snippets/s_carousel_3.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_kickoff_default_image.jpg b/theme_orchid/static/src/img/snippets/s_kickoff_default_image.jpg index 8ad1ce8688..7907248749 100644 Binary files a/theme_orchid/static/src/img/snippets/s_kickoff_default_image.jpg and b/theme_orchid/static/src/img/snippets/s_kickoff_default_image.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_product_3.jpg b/theme_orchid/static/src/img/snippets/s_product_3.jpg index 1f3cdb304b..04d4f16d0f 100644 Binary files a/theme_orchid/static/src/img/snippets/s_product_3.jpg and b/theme_orchid/static/src/img/snippets/s_product_3.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_product_4.jpg b/theme_orchid/static/src/img/snippets/s_product_4.jpg index dc54c50297..e5f5a81957 100644 Binary files a/theme_orchid/static/src/img/snippets/s_product_4.jpg and b/theme_orchid/static/src/img/snippets/s_product_4.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_product_5.jpg b/theme_orchid/static/src/img/snippets/s_product_5.jpg index aa89678aae..75f51c3045 100644 Binary files a/theme_orchid/static/src/img/snippets/s_product_5.jpg and b/theme_orchid/static/src/img/snippets/s_product_5.jpg differ diff --git a/theme_orchid/static/src/img/snippets/s_product_6.jpg b/theme_orchid/static/src/img/snippets/s_product_6.jpg index 905531df80..0c9467f6d7 100644 Binary files a/theme_orchid/static/src/img/snippets/s_product_6.jpg and b/theme_orchid/static/src/img/snippets/s_product_6.jpg differ diff --git a/theme_orchid/static/src/js/tour.js b/theme_orchid/static/src/js/tour.js index 98f7e35e5e..d7268b9cbb 100644 --- a/theme_orchid/static/src/js/tour.js +++ b/theme_orchid/static/src/js/tour.js @@ -1,53 +1,67 @@ /** @odoo-module */ import * as wTourUtils from '@website/js/tours/tour_utils'; -import { _t } from "@web/core/l10n/translation"; + const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_kickoff', + name: 'Kickoff', groupName: "Intro", }, { - id: 's_image_text', - name: 'Image - Text', - groupName: "Content", + id: 's_key_images', + name: 'Key Images', + groupName: "Columns", }, { - id: 's_text_image', - name: 'Text - Image', + id: 's_process_steps', + name: 'Steps', groupName: "Content", }, { - id: 's_three_columns', - name: 'Columns', + id: 's_freegrid', + name: 'Free grid', groupName: "Columns", }, { - id: 's_quotes_carousel', - name: 'Quotes', + id: 's_image_text_overlap', + name: 'Image - Text Overlap', + groupName: "Content", + }, + { + id: 's_company_team_basic', + name: 'Team Basic', groupName: "People", }, { - id: 's_call_to_action', - name: 'Call to Action', - groupName: "Content", + id: 's_title', + name: 'Title', + groupName: "Text", + }, + { + id: 's_images_wall', + name: 'Images Wall', + groupName: "Images", + }, + { + id: 's_references', + name: 'References', + groupName: "People", }, ]; wTourUtils.registerThemeHomepageTour("orchid_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"orchid-7"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-light-9"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1'), wTourUtils.goBackToBlocks(), ...wTourUtils.dragNDrop(snippets[1]), ...wTourUtils.dragNDrop(snippets[2]), ...wTourUtils.dragNDrop(snippets[3]), - ...wTourUtils.clickOnSnippet(snippets[3]), - wTourUtils.changeOption('ContainerWidth', 'we-button-group.o_we_user_value_widget', _t('width')), - wTourUtils.goBackToBlocks(), ...wTourUtils.dragNDrop(snippets[4]), ...wTourUtils.dragNDrop(snippets[5]), - ...wTourUtils.clickOnText(snippets[5], 'h3'), + ...wTourUtils.dragNDrop(snippets[6]), + ...wTourUtils.dragNDrop(snippets[7]), + ...wTourUtils.dragNDrop(snippets[8]), ]); diff --git a/theme_orchid/static/src/scss/bootstrap_overridden.scss b/theme_orchid/static/src/scss/bootstrap_overridden.scss deleted file mode 100644 index f865c6f3cf..0000000000 --- a/theme_orchid/static/src/scss/bootstrap_overridden.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Headings font weight - -$headings-font-weight: $o-theme-headings-font-weight !default; diff --git a/theme_orchid/static/src/scss/primary_variables.scss b/theme_orchid/static/src/scss/primary_variables.scss index 9b2ad92a84..4edd65bc35 100644 --- a/theme_orchid/static/src/scss/primary_variables.scss +++ b/theme_orchid/static/src/scss/primary_variables.scss @@ -2,14 +2,6 @@ // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (62 / 16); -$o-theme-h2-font-size-multiplier: (48 / 16); -$o-theme-h3-font-size-multiplier: (36 / 16); -$o-theme-h5-font-size-multiplier: (21 / 16); -$o-theme-h6-font-size-multiplier: (18 / 16); - -$o-theme-headings-font-weight: 600; - $o-theme-font-configs: ( 'Heebo': ( 'family': ('Heebo', sans-serif), @@ -51,6 +43,14 @@ $o-theme-font-configs: ( 'family': ('Cormorant Garamond', serif), 'url': 'Cormorant+Garamond:300,300i,400,400i,700,700i', ), + 'Elsie': ( + 'family': ('Elsie', serif), + 'url': 'Elsie:400,900', + ), + 'DM Sans': ( + 'family': ('DM Sans', serif), + 'url': 'DM+Sans:300,300i,400,400i,700,700i', + ), ); //------------------------------------------------------------------------------ @@ -59,15 +59,14 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'orchid-7', - 'font': 'Questrial', - 'headings-font': 'Cormorant Garamond', + 'color-palettes-name': 'default-light-9', + 'font': 'DM Sans', + 'headings-font': 'Elsie', + 'header-template': 'sales_four', 'footer-template': 'descriptive', ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'orchid-7'); - $o-color-palettes-compatibility-indexes: ( 1: 'orchid-1', 2: 'orchid-2', diff --git a/theme_orchid/views/snippets/s_company_team_basic.xml b/theme_orchid/views/snippets/s_company_team_basic.xml new file mode 100644 index 0000000000..2d9112383f --- /dev/null +++ b/theme_orchid/views/snippets/s_company_team_basic.xml @@ -0,0 +1,42 @@ + + + + + + diff --git a/theme_orchid/views/snippets/s_cover.xml b/theme_orchid/views/snippets/s_cover.xml index d52cc157aa..b5f694e8dd 100644 --- a/theme_orchid/views/snippets/s_cover.xml +++ b/theme_orchid/views/snippets/s_cover.xml @@ -15,15 +15,4 @@ - - diff --git a/theme_orchid/views/snippets/s_framed_intro.xml b/theme_orchid/views/snippets/s_framed_intro.xml index 0bc89fe911..8383f5989e 100644 --- a/theme_orchid/views/snippets/s_framed_intro.xml +++ b/theme_orchid/views/snippets/s_framed_intro.xml @@ -2,9 +2,32 @@ + diff --git a/theme_orchid/views/snippets/s_image_text.xml b/theme_orchid/views/snippets/s_image_text.xml index 17d191a052..b57189c4e0 100644 --- a/theme_orchid/views/snippets/s_image_text.xml +++ b/theme_orchid/views/snippets/s_image_text.xml @@ -27,15 +27,4 @@ - - diff --git a/theme_orchid/views/snippets/s_image_text_overlap.xml b/theme_orchid/views/snippets/s_image_text_overlap.xml new file mode 100644 index 0000000000..5332a02432 --- /dev/null +++ b/theme_orchid/views/snippets/s_image_text_overlap.xml @@ -0,0 +1,55 @@ + + + + + + + + diff --git a/theme_orchid/views/snippets/s_images_wall.xml b/theme_orchid/views/snippets/s_images_wall.xml new file mode 100644 index 0000000000..87c15221d2 --- /dev/null +++ b/theme_orchid/views/snippets/s_images_wall.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/theme_orchid/views/snippets/s_key_images.xml b/theme_orchid/views/snippets/s_key_images.xml index 0f3d9ec4d7..05a9b7df7a 100644 --- a/theme_orchid/views/snippets/s_key_images.xml +++ b/theme_orchid/views/snippets/s_key_images.xml @@ -2,54 +2,68 @@ + + diff --git a/theme_orchid/views/snippets/s_kickoff.xml b/theme_orchid/views/snippets/s_kickoff.xml new file mode 100644 index 0000000000..2d82261c82 --- /dev/null +++ b/theme_orchid/views/snippets/s_kickoff.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/theme_orchid/views/snippets/s_media_list.xml b/theme_orchid/views/snippets/s_media_list.xml index aceeb18f5d..f3325d14a8 100644 --- a/theme_orchid/views/snippets/s_media_list.xml +++ b/theme_orchid/views/snippets/s_media_list.xml @@ -4,44 +4,17 @@ diff --git a/theme_orchid/views/snippets/s_process_steps.xml b/theme_orchid/views/snippets/s_process_steps.xml new file mode 100644 index 0000000000..c834e5ad05 --- /dev/null +++ b/theme_orchid/views/snippets/s_process_steps.xml @@ -0,0 +1,44 @@ + + + + + + + diff --git a/theme_orchid/views/snippets/s_quotes_carousel.xml b/theme_orchid/views/snippets/s_quotes_carousel.xml index 7df86ecf97..169dcb51d5 100644 --- a/theme_orchid/views/snippets/s_quotes_carousel.xml +++ b/theme_orchid/views/snippets/s_quotes_carousel.xml @@ -46,15 +46,4 @@ - - diff --git a/theme_orchid/views/snippets/s_references.xml b/theme_orchid/views/snippets/s_references.xml new file mode 100644 index 0000000000..cf90aa5372 --- /dev/null +++ b/theme_orchid/views/snippets/s_references.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/theme_orchid/views/snippets/s_text_image.xml b/theme_orchid/views/snippets/s_text_image.xml index b787097136..5230888609 100644 --- a/theme_orchid/views/snippets/s_text_image.xml +++ b/theme_orchid/views/snippets/s_text_image.xml @@ -40,15 +40,4 @@ - - diff --git a/theme_orchid/views/snippets/s_three_columns.xml b/theme_orchid/views/snippets/s_three_columns.xml index 514966f648..e681ffe58c 100644 --- a/theme_orchid/views/snippets/s_three_columns.xml +++ b/theme_orchid/views/snippets/s_three_columns.xml @@ -4,16 +4,12 @@ - - diff --git a/theme_orchid/views/snippets/s_title.xml b/theme_orchid/views/snippets/s_title.xml new file mode 100644 index 0000000000..cc27cb85fd --- /dev/null +++ b/theme_orchid/views/snippets/s_title.xml @@ -0,0 +1,24 @@ + + + + + +