diff --git a/theme_avantgarde/__manifest__.py b/theme_avantgarde/__manifest__.py index 580e7b3b9..d228765ff 100644 --- a/theme_avantgarde/__manifest__.py +++ b/theme_avantgarde/__manifest__.py @@ -18,14 +18,12 @@ ], 'images_preview_theme': { 'website.s_cover_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg', - 'website.s_picture_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg', - 'website.s_three_columns_default_image_1': '/theme_avantgarde/static/src/img/pictures/bg_image_15', - 'website.s_three_columns_default_image_2': '/theme_avantgarde/static/src/img/pictures/bg_image_16.jpg', - 'website.s_three_columns_default_image_3': '/theme_avantgarde/static/src/img/pictures/bg_image_17.jpg', - 'website.s_text_image_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg', + 'website.library_image_13': '/theme_avantgarde/static/src/img/pictures/library_image_13.jpg', + 'website.library_image_03': '/theme_avantgarde/static/src/img/pictures/library_image_03.jpg', + 'website.library_image_16': '/theme_avantgarde/static/src/img/pictures/library_image_16.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_picture', 's_three_columns', 's_text_image', 's_call_to_action'], + 'homepage': ['s_sidegrid', 's_features_wall', 's_masonry_block', 's_carousel', 's_timeline', 's_quadrant'], }, 'depends': ['theme_common'], 'license': 'LGPL-3', diff --git a/theme_avantgarde/static/description/avantgarde_screenshot.jpg b/theme_avantgarde/static/description/avantgarde_screenshot.jpg index 649c2949c..4508294c5 100644 Binary files a/theme_avantgarde/static/description/avantgarde_screenshot.jpg and b/theme_avantgarde/static/description/avantgarde_screenshot.jpg differ diff --git a/theme_avantgarde/static/description/poster.jpg b/theme_avantgarde/static/description/poster.jpg index 386aac67a..4e8909780 100644 Binary files a/theme_avantgarde/static/description/poster.jpg and b/theme_avantgarde/static/description/poster.jpg differ diff --git a/theme_avantgarde/static/description/theme_avantgarde.svg b/theme_avantgarde/static/description/theme_avantgarde.svg index 5c9bfa1f0..e5fa2c3d9 100644 --- a/theme_avantgarde/static/description/theme_avantgarde.svg +++ b/theme_avantgarde/static/description/theme_avantgarde.svg @@ -1,222 +1,192 @@ - + - - - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - We are Avantgarde. + + + + + + + + + + - - - - - - - - A Section Title - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - Entry Title - - - - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - - - - - - - - - - - - - Section - Title - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_04.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_04.jpg index d957cb4d9..cde11112f 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_04.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_04.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg index 3cea6e496..7f0cb31e2 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg index 743adaec5..c84cfbf86 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg index a7c6b055f..33463d44e 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_20.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_20.jpg index 76057a110..3f457e572 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_20.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_20.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_28.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_28.jpg index 9db2f12ea..62ba4d7f8 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_28.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_28.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_29.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_29.jpg index 9ffcba696..459b1e1ed 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_29.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_29.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_30.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_30.jpg index ddcfb648b..64ed380e1 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_30.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_30.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_34.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_34.jpg index c81cac703..b06f017dd 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_34.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_34.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/bg_image_35.jpg b/theme_avantgarde/static/src/img/pictures/bg_image_35.jpg index 3f1bda31b..6e0276650 100644 Binary files a/theme_avantgarde/static/src/img/pictures/bg_image_35.jpg and b/theme_avantgarde/static/src/img/pictures/bg_image_35.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/library_image_03.jpg b/theme_avantgarde/static/src/img/pictures/library_image_03.jpg index cd040a9d1..e98580459 100644 Binary files a/theme_avantgarde/static/src/img/pictures/library_image_03.jpg and b/theme_avantgarde/static/src/img/pictures/library_image_03.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/library_image_13.jpg b/theme_avantgarde/static/src/img/pictures/library_image_13.jpg new file mode 100644 index 000000000..a8ac42ca4 Binary files /dev/null and b/theme_avantgarde/static/src/img/pictures/library_image_13.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/library_image_16.jpg b/theme_avantgarde/static/src/img/pictures/library_image_16.jpg new file mode 100644 index 000000000..db0430a9f Binary files /dev/null and b/theme_avantgarde/static/src/img/pictures/library_image_16.jpg differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_01.jpg b/theme_avantgarde/static/src/img/pictures/uiface_01.jpg deleted file mode 100644 index d242531ad..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_01.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_02.jpg b/theme_avantgarde/static/src/img/pictures/uiface_02.jpg deleted file mode 100644 index 95705de41..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_02.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_03.jpg b/theme_avantgarde/static/src/img/pictures/uiface_03.jpg deleted file mode 100644 index 2cb003a3e..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_03.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_04.jpg b/theme_avantgarde/static/src/img/pictures/uiface_04.jpg deleted file mode 100644 index 8adb5490d..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_04.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_05.jpg b/theme_avantgarde/static/src/img/pictures/uiface_05.jpg deleted file mode 100644 index 93f4048fb..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_05.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/img/pictures/uiface_06.jpg b/theme_avantgarde/static/src/img/pictures/uiface_06.jpg deleted file mode 100644 index e3dff4d83..000000000 Binary files a/theme_avantgarde/static/src/img/pictures/uiface_06.jpg and /dev/null differ diff --git a/theme_avantgarde/static/src/js/tour.js b/theme_avantgarde/static/src/js/tour.js index eafce2751..8e52764c7 100644 --- a/theme_avantgarde/static/src/js/tour.js +++ b/theme_avantgarde/static/src/js/tour.js @@ -3,34 +3,39 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_sidegrid', + name: 'Sidegrid', groupName: "Intro", }, { - id: 's_picture', - name: 'Title - Image', - groupName: "Images", - }, - { - id: 's_three_columns', - name: 'Columns', + id: 's_features_wall', + name: 'Features Wall', groupName: "Columns", }, { - id: 's_text_image', - name: 'Text - Image', + id: 's_masonry_block', + name: 'Masonry', + groupName: "Images", + }, + { + id: 's_carousel', + name: 'Carousel', + groupName: "Intro", + }, + { + id: 's_timeline', + name: 'Timeline', groupName: "Content", }, { - id: 's_call_to_action', - name: 'Call to Action', - groupName: "Content", + id: 's_quadrant', + name: 'Quadrant', + groupName: "Images", }, ]; wTourUtils.registerThemeHomepageTour("avantgarde_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"avantgarde-3"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-15"'), ...wTourUtils.dragNDrop(snippets[0], 'top'), ...wTourUtils.clickOnText(snippets[0], 'h1', 'left'), wTourUtils.goBackToBlocks(), @@ -41,4 +46,5 @@ wTourUtils.registerThemeHomepageTour("avantgarde_tour", () => [ wTourUtils.goBackToBlocks(), ...wTourUtils.dragNDrop(snippets[3], 'top'), ...wTourUtils.dragNDrop(snippets[4], 'top'), + ...wTourUtils.dragNDrop(snippets[5], 'top'), ]); diff --git a/theme_avantgarde/static/src/scss/primary_variables.scss b/theme_avantgarde/static/src/scss/primary_variables.scss index c250fa637..9872f787b 100644 --- a/theme_avantgarde/static/src/scss/primary_variables.scss +++ b/theme_avantgarde/static/src/scss/primary_variables.scss @@ -173,21 +173,20 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'avantgarde-3', + 'color-palettes-name': 'default-15', - 'font': 'Syne', + 'font': 'Open Sans', + 'headings-font': 'Syne', 'header-template': 'hamburger', - 'hamburger-position': 'right', 'footer-template': 'descriptive', - 'btn-primary-outline': true, 'link-underline': 'never', ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'avantgarde-3'); +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-15'); $o-color-palettes-compatibility-indexes: ( 1: 'avantgarde-1', diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml index 43ef2bf8f..312515f5b 100644 --- a/theme_avantgarde/views/customizations.xml +++ b/theme_avantgarde/views/customizations.xml @@ -21,9 +21,6 @@
- - - We are Avantgarde. @@ -33,6 +30,69 @@ + + +