diff --git a/theme_bewise/__manifest__.py b/theme_bewise/__manifest__.py index 1b78ad452..01dd4e7d5 100644 --- a/theme_bewise/__manifest__.py +++ b/theme_bewise/__manifest__.py @@ -4,7 +4,7 @@ 'category': 'Theme/Education', 'summary': 'University, Education, Schools, Young, Play, Kids', 'sequence': 240, - 'version': '2.1.0', + 'version': '3.0.0', 'depends': ['theme_common'], 'data': [ 'data/generate_primary_template.xml', @@ -18,15 +18,13 @@ 'static/description/bewise_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_cover_default_image': '/theme_bewise/static/src/img/backgrounds/college_bg.jpg', - 'website.s_text_image_default_image': '/theme_bewise/static/src/img/content/college_graduate.jpg', - 'website.s_image_text_default_image': '/theme_bewise/static/src/img/content/college_students.jpg', + 'website.s_picture_default_image': '/theme_bewise/static/src/img/content/college_library.jpg', 'website.s_media_list_default_image_1': '/theme_bewise/static/src/img/content/college_media_1.jpg', 'website.s_media_list_default_image_2': '/theme_bewise/static/src/img/content/college_media_2.jpg', - 'website.s_quotes_carousel_demo_image_0': '/theme_bewise/static/src/img/backgrounds/college_bg_4.jpg', + 'website.s_masonry_block_default_image_1': '/theme_bewise/static/src/img/content/content_img_25.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_call_to_action', 's_text_image', 's_numbers', 's_image_text', 's_quotes_carousel', 's_color_blocks_2'], + 'homepage': ['s_striped_center_top', 's_title', 's_color_blocks_2', 's_faq_collapse', 's_masonry_block', 's_company_team_shapes'], }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-bewise.odoo.com', diff --git a/theme_bewise/static/description/bewise_screenshot.jpg b/theme_bewise/static/description/bewise_screenshot.jpg index c6b755956..0006a8c2f 100644 Binary files a/theme_bewise/static/description/bewise_screenshot.jpg and b/theme_bewise/static/description/bewise_screenshot.jpg differ diff --git a/theme_bewise/static/description/theme_bewise.svg b/theme_bewise/static/description/theme_bewise.svg index e37647f41..4b753587b 100644 --- a/theme_bewise/static/description/theme_bewise.svg +++ b/theme_bewise/static/description/theme_bewise.svg @@ -1,39 +1,39 @@ - - theme_bewise + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + + @@ -46,266 +46,168 @@ - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + Section Title + + + + + - - - Welcome Message - - - - - - - - - - - - - Discover - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - Discover - - - - - - - - A very long Subtitle - - - - - - - - - - - - - - - - - - - - - Section Title + + + Section title - - - - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 40 - 23 - 8 - 12 - - - - - - - - - - - - - - - Section Title - - - - - Discover - - - - - - - - + + + + + + + - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - Block Title - - - - - Discover - + + + + - - - - - Block Title - - - - - - + + + - - - - Discover - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Entry Title + - - - - - + + + + + + + + + + + + + + + + + + + + Entry Title + + + Section Title + + + + + + + + + Welcome message + + + + + + + + + + LOGO + + - + \ No newline at end of file diff --git a/theme_bewise/static/src/img/content/college_library.jpg b/theme_bewise/static/src/img/content/college_library.jpg index c1740981c..33a25af55 100644 Binary files a/theme_bewise/static/src/img/content/college_library.jpg and b/theme_bewise/static/src/img/content/college_library.jpg differ diff --git a/theme_bewise/static/src/js/tour.js b/theme_bewise/static/src/js/tour.js index 5f10d9eff..ff2f819bf 100644 --- a/theme_bewise/static/src/js/tour.js +++ b/theme_bewise/static/src/js/tour.js @@ -1,58 +1,47 @@ /** @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_striped_center_top', + name: 'Striped Center Top', groupName: "Intro", }, { - id: 's_call_to_action', - name: 'Call to Action', - groupName: "Content", - }, - { - id: 's_text_image', - name: 'Text - Image', - groupName: "Content", - }, - { - id: 's_numbers', - name: 'Numbers', - groupName: "Content", - }, - { - id: 's_image_text', - name: 'Image - Text', - groupName: "Content", - }, - { - id: 's_quotes_carousel', - name: 'Quotes', - groupName: "People", + id: 's_title', + name: 'Title', + groupName: "Text", }, { id: 's_color_blocks_2', name: 'Big Boxes', groupName: "Content", }, + { + id: 's_faq_collapse', + name: 'FAQ Block', + groupName: "Text", + }, + { + id: 's_masonry_block', + name: 'Masonry', + groupName: "Images", + }, + { + id: 's_company_team_shapes', + name: 'Team Shapes', + groupName: "People", + }, ]; wTourUtils.registerThemeHomepageTour("bewise_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"bewise-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-19"'), ...wTourUtils.insertSnippet(snippets[0], 'top'), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), ...wTourUtils.insertSnippet(snippets[1], 'top'), ...wTourUtils.insertSnippet(snippets[2], 'top'), ...wTourUtils.insertSnippet(snippets[3], 'top'), - ...wTourUtils.clickOnSnippet(snippets[3], '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.insertSnippet(snippets[4], 'top'), ...wTourUtils.insertSnippet(snippets[5], 'top'), - ...wTourUtils.insertSnippet(snippets[6], 'top'), ]); diff --git a/theme_bewise/static/src/scss/primary_variables.scss b/theme_bewise/static/src/scss/primary_variables.scss index 726d512d8..8dab4d14c 100644 --- a/theme_bewise/static/src/scss/primary_variables.scss +++ b/theme_bewise/static/src/scss/primary_variables.scss @@ -41,14 +41,11 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (56 / 21); -$o-theme-h2-font-size-multiplier: (36 / 21); -$o-theme-h3-font-size-multiplier: (28 / 21); -$o-theme-h4-font-size-multiplier: (24 / 21); -$o-theme-h5-font-size-multiplier: 1; -$o-theme-h6-font-size-multiplier: (18 / 21); - $o-theme-font-configs: ( + 'Source Sans Pro': ( + 'family': ('Source Sans Pro', sans-serif), + 'url': 'Source+Sans+Pro:300,300i,400,400i,700,700i', + ), 'Lato': ( 'family': ('Lato', sans-serif), 'url': 'Lato:300,300i,400,400i,700,700i', @@ -101,24 +98,15 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'bewise-1', + 'color-palettes-name': 'default-19', - 'header-font-size': (20 / 16) * 1rem, - 'font-size-base': 1.3125rem, - - 'font': 'Darker Grotesque', - 'headings-font': 'Raleway', + 'font': 'Source Sans Pro', + 'headings-font': 'Darker Grotesque', 'footer-template': 'headline', - - 'btn-font-size-lg': 1.65rem, - 'btn-padding-y-lg': .5rem, - 'btn-ripple': true, ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'bewise-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'bewise-1', 2: 'bewise-2', @@ -147,12 +135,3 @@ $o-theme-color-palettes-compatibility-indexes: ( 3: 'bewise-3', 4: 'bewise-4', ); - -//------------------------------------------------------------------------------ -// Shapes -//------------------------------------------------------------------------------ - -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/14_001', (3: 1, 4: 1)); -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Rainy/08_001', (1: 1, 4: 1)); -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/06', (1: 3, 2: 5, 3: 5, 5: 3)); -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Airy/04_001', (1: 3)); diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml index f922b1664..a35689cbd 100644 --- a/theme_bewise/views/customizations.xml +++ b/theme_bewise/views/customizations.xml @@ -51,6 +51,19 @@ + + + @@ -1111,4 +1127,15 @@ + + + diff --git a/theme_bewise/views/image_content.xml b/theme_bewise/views/image_content.xml index d4b64b1db..bb4609d89 100644 --- a/theme_bewise/views/image_content.xml +++ b/theme_bewise/views/image_content.xml @@ -387,5 +387,20 @@ website.s_empowerment_default_image /theme_bewise/static/src/img/content/s_empowerment_default_image.jpg + + website.s_three_columns_default_image_1 + website.s_three_columns_default_image_1 + /theme_bewise/static/src/img/content/college_carousel_2.jpg + + + website.s_three_columns_default_image_2 + website.s_three_columns_default_image_2 + /theme_bewise/static/src/img/content/college_graduate_2.jpg + + + website.s_three_columns_default_image_3 + website.s_three_columns_default_image_3 + /theme_bewise/static/src/img/content/library_image_10.jpg +