diff --git a/theme_odoo_experts/__manifest__.py b/theme_odoo_experts/__manifest__.py index 6861ae982..60dce25d3 100644 --- a/theme_odoo_experts/__manifest__.py +++ b/theme_odoo_experts/__manifest__.py @@ -28,19 +28,19 @@ 'views/snippets/s_features_grid.xml', 'views/snippets/s_product_list.xml', 'views/snippets/s_quotes_carousel.xml', + 'views/snippets/s_picture.xml', + 'views/snippets/s_title.xml', ], 'images': [ 'static/description/odoo_experts_description.jpg', 'static/description/odoo_experts_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_cover_default_image': '/theme_odoo_experts/static/src/img/snippets/s_cover.jpg', - 'website.s_media_list_default_image_1': '/theme_odoo_experts/static/src/img/snippets/s_media_list_1.jpg', - 'website.s_media_list_default_image_2': '/theme_odoo_experts/static/src/img/snippets/s_media_list_2.jpg', - 'website.s_media_list_default_image_3': '/theme_odoo_experts/static/src/img/snippets/s_media_list_3.jpg', + 'website.s_picture_default_image': '/theme_odoo_experts/static/src/img/snippets/s_picture.jpg', + 'website.s_text_image_default_image': '/theme_odoo_experts/static/src/img/snippets/s_text_image.jpg', }, 'snippet_lists': { - 'homepage': ['s_cover', 's_image_text', 's_media_list', 's_company_team', 's_references', 's_call_to_action'], + 'homepage': ['s_picture', 's_references', 's_image_text', 's_text_image', 's_title', 's_comparisons', 's_call_to_action'], }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-odoo-experts.odoo.com', diff --git a/theme_odoo_experts/static/description/odoo_experts_screenshot.jpg b/theme_odoo_experts/static/description/odoo_experts_screenshot.jpg index 761441543..e9bb542f3 100644 Binary files a/theme_odoo_experts/static/description/odoo_experts_screenshot.jpg and b/theme_odoo_experts/static/description/odoo_experts_screenshot.jpg differ diff --git a/theme_odoo_experts/static/description/theme_odoo_experts.svg b/theme_odoo_experts/static/description/theme_odoo_experts.svg index bd9504124..d35b1a854 100644 --- a/theme_odoo_experts/static/description/theme_odoo_experts.svg +++ b/theme_odoo_experts/static/description/theme_odoo_experts.svg @@ -1,28 +1,19 @@ - - + + - - + + - - + + - - + + - - - - - - - - - - - + + @@ -42,13 +33,28 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -62,19 +68,22 @@ + + + - + - - - - + + + + - + @@ -83,252 +92,239 @@ - - - - - - + + + + + + - - - - Welcome Message + + + Discover + + + + + + + + + - - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + Section Title + + + Discover + + + + + + + + + + + + + - - Section Title - Discover - - - - - + + + + + - - - - - - - - + + + Section Title + + + Discover + + + + - Entry Title - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - Entry Title - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - - - - - - - - - - - - - - - Team Member - Team Member - Team Member - Team Member - - - - + + + + Section Title + - - - Section Title - - - - - - - - + + + + + + + + + + + + + $35 + + + + + + Discover + + + + + + + + + + + + + + + + + + + $55 + + + + + + Discover + + + + + + + + + + + + + + + + + + + $85 + + + + + + Discover + + + + + + + + + + + + + + + - - - - - - - - Section Title - Discover - - - - - - - - - - - - - + + + + + + + Section Title + + + Discover + - - - - + + + + - - + + - - - + + + - - - - - - - + + + + + + + diff --git a/theme_odoo_experts/static/src/img/snippets/s_image_text_device.jpg b/theme_odoo_experts/static/src/img/snippets/s_image_text_device.jpg new file mode 100644 index 000000000..27f261d77 Binary files /dev/null and b/theme_odoo_experts/static/src/img/snippets/s_image_text_device.jpg differ diff --git a/theme_odoo_experts/static/src/img/snippets/s_image_text_device_perspective.jpg b/theme_odoo_experts/static/src/img/snippets/s_image_text_device_perspective.jpg new file mode 100644 index 000000000..0b1b9d13e Binary files /dev/null and b/theme_odoo_experts/static/src/img/snippets/s_image_text_device_perspective.jpg differ diff --git a/theme_odoo_experts/static/src/img/snippets/s_parallax.jpg b/theme_odoo_experts/static/src/img/snippets/s_parallax.jpg index fccc2e0b5..a9fb47ba2 100644 Binary files a/theme_odoo_experts/static/src/img/snippets/s_parallax.jpg and b/theme_odoo_experts/static/src/img/snippets/s_parallax.jpg differ diff --git a/theme_odoo_experts/static/src/img/snippets/s_picture.jpg b/theme_odoo_experts/static/src/img/snippets/s_picture.jpg index 8c866e813..2a0a263c8 100644 Binary files a/theme_odoo_experts/static/src/img/snippets/s_picture.jpg and b/theme_odoo_experts/static/src/img/snippets/s_picture.jpg differ diff --git a/theme_odoo_experts/static/src/img/snippets/s_picture_bg.jpg b/theme_odoo_experts/static/src/img/snippets/s_picture_bg.jpg new file mode 100644 index 000000000..9cee0babd Binary files /dev/null and b/theme_odoo_experts/static/src/img/snippets/s_picture_bg.jpg differ diff --git a/theme_odoo_experts/static/src/img/snippets/s_text_image.jpg b/theme_odoo_experts/static/src/img/snippets/s_text_image.jpg index 258d662ea..7ff7b8fb1 100644 Binary files a/theme_odoo_experts/static/src/img/snippets/s_text_image.jpg and b/theme_odoo_experts/static/src/img/snippets/s_text_image.jpg differ diff --git a/theme_odoo_experts/static/src/js/tour.js b/theme_odoo_experts/static/src/js/tour.js index afe56520e..48a8b71c7 100644 --- a/theme_odoo_experts/static/src/js/tour.js +++ b/theme_odoo_experts/static/src/js/tour.js @@ -5,25 +5,29 @@ import { _t } from 'web.core'; const snippets = [ { - id: 's_cover', - name: 'Cover', - }, - { - id: 's_image_text', - name: 'Image - Text', - }, - { - id: 's_media_list', - name: 'Media List', - }, - { - id: 's_company_team', - name: 'Team', + id: 's_picture', + name: 'Picture', }, { id: 's_references', name: 'References', }, + { + id: 's_text_image', + name: 'Image - Text', + }, + { + id: 's_text_image', + name: 'Text - Image', + }, + { + id: 's_title', + name: 'Title', + }, + { + id: 's_comparisons', + name: 'Comparisons', + }, { id: 's_call_to_action', name: 'Call to Action', @@ -32,14 +36,16 @@ const snippets = [ wTourUtils.registerThemeHomepageTour("odoo_experts_tour", [ wTourUtils.dragNDrop(snippets[0]), - wTourUtils.clickOnText(snippets[0], 'h1'), - wTourUtils.goBackToBlocks(), wTourUtils.dragNDrop(snippets[1]), wTourUtils.dragNDrop(snippets[2]), + wTourUtils.clickOnText(snippets[2], 'h2'), + wTourUtils.goBackToBlocks(), wTourUtils.dragNDrop(snippets[3]), wTourUtils.dragNDrop(snippets[4]), - wTourUtils.clickOnSnippet(snippets[4], 'top'), - wTourUtils.changeOption('ContainerWidth', 'we-button-group.o_we_user_value_widget', _t('width')), - wTourUtils.goBackToBlocks(), wTourUtils.dragNDrop(snippets[5]), + wTourUtils.clickOnSnippet(snippets[5], 'top'), + wTourUtils.changeOption('BackgroundShape', 'we-toggler', _t('Background Shape')), + wTourUtils.selectNested('we-select-page', 'BackgroundShape', ':not(.o_we_pager_controls)', _t('Background Shape')), + wTourUtils.goBackToBlocks(), + wTourUtils.dragNDrop(snippets[6]), ]); diff --git a/theme_odoo_experts/static/src/scss/primary_variables.scss b/theme_odoo_experts/static/src/scss/primary_variables.scss index 927c8a3aa..0a77ffb53 100644 --- a/theme_odoo_experts/static/src/scss/primary_variables.scss +++ b/theme_odoo_experts/static/src/scss/primary_variables.scss @@ -76,9 +76,15 @@ $o-website-values-palettes: ( 'logo-height': (52 / 16) * 1rem, 'fixed-logo-height': (52 / 16) * 1rem, 'header-font-size': 1rem, - 'btn-border-radius': 0, - 'btn-border-radius-lg': 0, - 'btn-border-radius-sm': 0, + 'btn-border-radius': 10rem, + 'btn-border-radius-lg': 10rem, + 'btn-border-radius-sm': 10rem, + 'btn-padding-y': .45rem, + 'btn-padding-x': 1.35rem, + 'btn-padding-y-sm': .3rem, + 'btn-padding-x-sm': .9rem, + 'btn-padding-y-lg': .6rem, + 'btn-padding-x-lg': 1.8rem, 'font': 'Lato', 'headings-font': 'Work Sans', 'navbar-font': 'Work Sans', @@ -90,6 +96,7 @@ $o-website-values-palettes: ( ); $o-palette-priority-prefix: 'odoo-experts'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'odoo-experts-1'); $o-color-palettes-compatibility-indexes: ( 1: 'odoo-experts-1', @@ -129,3 +136,7 @@ $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/04', (5: 5)); $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Rainy/10', (1: 5, 3: 5)); $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Airy/01', (1: 3)); $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Airy/03_001', (5: 4)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/08', (2: 2)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Bold/01', (2: 2)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Airy/12_001', (1: 5, 3: 1)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/04', (1: 5, 5: 4)); diff --git a/theme_odoo_experts/views/images.xml b/theme_odoo_experts/views/images.xml index ccaff66e1..88ba97086 100644 --- a/theme_odoo_experts/views/images.xml +++ b/theme_odoo_experts/views/images.xml @@ -206,4 +206,21 @@ Check in theme_loftspace's primary_variables.scss and theme.scss --> /theme_odoo_experts/static/src/img/snippets/s_product_catalog_default_image.jpg + + + website.s_image_text_device + website.s_image_text_device + /theme_odoo_experts/static/src/img/snippets/s_image_text_device.jpg + + + website.s_image_text_device_perspective + website.s_image_text_device_perspective + /theme_odoo_experts/static/src/img/snippets/s_image_text_device_perspective.jpg + + + website.s_picture_default_image_bg + website.s_picture_default_image_bg + /theme_odoo_experts/static/src/img/snippets/s_picture_bg.jpg + + diff --git a/theme_odoo_experts/views/snippets/s_call_to_action.xml b/theme_odoo_experts/views/snippets/s_call_to_action.xml index 173811616..9767bf5a6 100644 --- a/theme_odoo_experts/views/snippets/s_call_to_action.xml +++ b/theme_odoo_experts/views/snippets/s_call_to_action.xml @@ -4,23 +4,25 @@ diff --git a/theme_odoo_experts/views/snippets/s_comparisons.xml b/theme_odoo_experts/views/snippets/s_comparisons.xml index 44958db6a..f674d6e1f 100644 --- a/theme_odoo_experts/views/snippets/s_comparisons.xml +++ b/theme_odoo_experts/views/snippets/s_comparisons.xml @@ -4,12 +4,11 @@ diff --git a/theme_odoo_experts/views/snippets/s_image_text.xml b/theme_odoo_experts/views/snippets/s_image_text.xml index bde028e9c..3390fe5e4 100644 --- a/theme_odoo_experts/views/snippets/s_image_text.xml +++ b/theme_odoo_experts/views/snippets/s_image_text.xml @@ -4,24 +4,32 @@ diff --git a/theme_odoo_experts/views/snippets/s_picture.xml b/theme_odoo_experts/views/snippets/s_picture.xml new file mode 100644 index 000000000..b4a597380 --- /dev/null +++ b/theme_odoo_experts/views/snippets/s_picture.xml @@ -0,0 +1,49 @@ + + + + + + diff --git a/theme_odoo_experts/views/snippets/s_references.xml b/theme_odoo_experts/views/snippets/s_references.xml index 747692683..fe9ee250c 100644 --- a/theme_odoo_experts/views/snippets/s_references.xml +++ b/theme_odoo_experts/views/snippets/s_references.xml @@ -4,38 +4,11 @@ diff --git a/theme_odoo_experts/views/snippets/s_text_image.xml b/theme_odoo_experts/views/snippets/s_text_image.xml index 2fcd6cfd3..a23b27a06 100644 --- a/theme_odoo_experts/views/snippets/s_text_image.xml +++ b/theme_odoo_experts/views/snippets/s_text_image.xml @@ -4,26 +4,44 @@ diff --git a/theme_odoo_experts/views/snippets/s_title.xml b/theme_odoo_experts/views/snippets/s_title.xml new file mode 100644 index 000000000..3a3bae0ba --- /dev/null +++ b/theme_odoo_experts/views/snippets/s_title.xml @@ -0,0 +1,11 @@ + + + + + +