diff --git a/theme_notes/__manifest__.py b/theme_notes/__manifest__.py index ee568e9b9..8347efb07 100644 --- a/theme_notes/__manifest__.py +++ b/theme_notes/__manifest__.py @@ -13,6 +13,7 @@ 'views/snippets/s_cta_box.xml', 'views/snippets/s_carousel.xml', + 'views/snippets/s_striped.xml', 'views/snippets/s_striped_top.xml', 'views/snippets/s_cards_grid.xml', 'views/snippets/s_carousel_intro.xml', @@ -24,6 +25,7 @@ 'views/snippets/s_masonry_block.xml', 'views/snippets/s_product_catalog.xml', 'views/snippets/s_freegrid.xml', + 'views/snippets/s_title.xml', 'views/snippets/s_banner.xml', 'views/snippets/s_cover.xml', 'views/snippets/s_card_offset.xml', @@ -31,6 +33,7 @@ 'views/snippets/s_image_title.xml', 'views/snippets/s_framed_intro.xml', 'views/snippets/s_numbers.xml', + 'views/snippets/s_image_text_overlap.xml', 'views/snippets/s_three_columns.xml', 'views/snippets/s_color_blocks_2.xml', 'views/snippets/s_company_team_detail.xml', @@ -42,6 +45,7 @@ 'views/snippets/s_features_grid.xml', 'views/snippets/s_product_list.xml', 'views/snippets/s_parallax.xml', + 'views/snippets/s_pricelist_cafe.xml', 'views/snippets/s_comparisons.xml', 'views/snippets/s_quotes_carousel.xml', 'views/snippets/s_quotes_carousel_minimal.xml', @@ -66,16 +70,21 @@ 'static/description/notes_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_carousel_default_image_1': '/theme_notes/static/src/img/content/content_img_22.jpg', - 'website.s_masonry_block_default_image_1': '/theme_notes/static/src/img/content/content_img_21.jpg', + 'website.library_image_03': '/theme_notes/static/src/img/content/library_image_19.jpg', + 'website.library_image_05': '/theme_notes/static/src/img/content/library_image_05.jpg', + 'website.library_image_10': '/theme_notes/static/src/img/content/library_image_10.jpg', + 'website.library_image_14': '/theme_notes/static/src/img/content/library_image_14.jpg', + 'website.library_image_16': '/theme_notes/static/src/img/content/library_image_16.jpg', + 'website.s_carousel_default_image_2': '/theme_notes/static/src/img/content/content_img_23.jpg', + 'website.s_cover_default_image': '/theme_notes/static/src/img/content/content_img_14.jpg', + 'website.s_image_text_default_image': '/theme_notes/static/src/img/content/content_img_16.jpg', + 'website.s_three_columns_default_image_1': '/theme_notes/static/src/img/content/content_img_18.jpg', + 'website.s_three_columns_default_image_2': '/theme_notes/static/src/img/content/content_img_19.jpg', + 'website.s_three_columns_default_image_3': '/theme_notes/static/src/img/content/content_img_20.jpg', 'website.s_text_image_default_image': '/theme_notes/static/src/img/content/content_img_15.jpg', - 'website.s_product_catalog_default_image': '/theme_notes/static/src/img/content/s_product_catalog_default_image.jpg', - 'website.s_media_list_default_image_1': '/theme_notes/static/src/img/content/content_img_25.jpg', - 'website.s_media_list_default_image_2': '/theme_notes/static/src/img/content/content_img_26.jpg', - 'website.s_media_list_default_image_3': '/theme_notes/static/src/img/content/content_img_27.jpg', }, 'configurator_snippets': { - 'homepage': ['s_carousel', 's_masonry_block', 's_text_image', 's_product_catalog', 's_media_list', 's_company_team'], + 'homepage': ['s_framed_intro', 's_image_text', 's_three_columns', 's_images_wall', 's_text_image', 's_company_team_shapes', 's_title', 's_call_to_action'], }, 'new_page_templates': { 'about': { diff --git a/theme_notes/static/description/notes_screenshot.jpg b/theme_notes/static/description/notes_screenshot.jpg index fb84c0071..f07cc0176 100644 Binary files a/theme_notes/static/description/notes_screenshot.jpg and b/theme_notes/static/description/notes_screenshot.jpg differ diff --git a/theme_notes/static/description/theme_notes.svg b/theme_notes/static/description/theme_notes.svg index df9b44411..9db8ee004 100644 --- a/theme_notes/static/description/theme_notes.svg +++ b/theme_notes/static/description/theme_notes.svg @@ -1,285 +1,228 @@ - + - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - Entry Title - - - - - Entry Title - - - - - Entry Title - - - - - Entry Title - - - - - - - - - - - - - - - - - Welcome Message - - - - - - - - - Discover - - - - - - - - - - - - - Section Title - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Entry Title - Entry Title - - - Section Title - - - - - - - - - - - - - - - - Section Title - Discover - - - - - - - - - - Section Title - Discover - - - - - - - - - - Section Title - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Team Member - Team Member - Team Member - Team Member - - - - - - - - - - - - - - - - - - - - - - - - - Entry Title + + + + + + + + + - + + + + + + \ No newline at end of file diff --git a/theme_notes/static/src/js/tour.js b/theme_notes/static/src/js/tour.js index 1753cbd68..f6538f5f0 100644 --- a/theme_notes/static/src/js/tour.js +++ b/theme_notes/static/src/js/tour.js @@ -5,39 +5,49 @@ import { _t } from "@web/core/l10n/translation"; const snippets = [ { - id: 's_carousel', - name: 'Carousel', + id: 's_framed_intro', + name: 'Framed Intro', groupName: "Intro", }, { - id: 's_masonry_block', - name: 'Masonry', + id: 's_image_text', + name: 'Image Text', groupName: "Images", }, + { + id: 's_three_columns', + name: 'Three Columns', + groupName: "Content", + }, + { + id: 's_images_wall', + name: 'Images Wall', + groupName: "Content", + }, { id: 's_text_image', - name: 'Text - Image', + name: 'Text Image', groupName: "Content", }, { - id: 's_product_catalog', - name: 'Pricelist', - groupName: "Content", - }, - { - id: 's_media_list', - name: 'Media List', - groupName: "Content", - }, - { - id: 's_company_team', + id: 's_company_team_shapes', name: 'Team', groupName: "People", }, + { + id: 's_title', + name: 'Title', + groupName: "Content", + }, + { + id: 's_call_to_action', + name: 'Call to Action', + groupName: "Content", + }, ]; wTourUtils.registerThemeHomepageTour("notes_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"notes-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-19"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h2'), wTourUtils.goBackToBlocks(), @@ -49,4 +59,6 @@ wTourUtils.registerThemeHomepageTour("notes_tour", () => [ ...wTourUtils.dragNDrop(snippets[3]), ...wTourUtils.dragNDrop(snippets[4]), ...wTourUtils.dragNDrop(snippets[5]), + ...wTourUtils.dragNDrop(snippets[6]), + ...wTourUtils.dragNDrop(snippets[7]), ]); diff --git a/theme_notes/static/src/scss/primary_variables.scss b/theme_notes/static/src/scss/primary_variables.scss index 698a088e8..7f6c50887 100644 --- a/theme_notes/static/src/scss/primary_variables.scss +++ b/theme_notes/static/src/scss/primary_variables.scss @@ -108,6 +108,10 @@ $o-theme-font-configs: ( 'family': ('Montserrat', sans-serif), 'url': 'Montserrat:300,300i,400,400i,700,700i', ), + 'Open Sans': ( + 'family': ('Open Sans', sans-serif), + 'url': 'Open+Sans:300,300i,400,400i,600,600i', + ), ); //------------------------------------------------------------------------------ @@ -116,11 +120,11 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'notes-1', + 'color-palettes-name': 'default-19', 'header-font-size': 1rem, 'logo-height': 3rem, 'fixed-logo-height': 3rem, - 'font': 'Oxygen', + 'font': 'Open Sans', 'headings-font': 'Montserrat', 'navbar-font': 'Montserrat', 'buttons-font': 'Montserrat', @@ -129,8 +133,6 @@ $o-website-values-palettes: ( ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'notes-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'notes-1', 2: 'notes-2', diff --git a/theme_notes/views/new_page_template.xml b/theme_notes/views/new_page_template.xml index 8e4ba1dcd..d33774299 100644 --- a/theme_notes/views/new_page_template.xml +++ b/theme_notes/views/new_page_template.xml @@ -11,15 +11,6 @@ - -