diff --git a/theme_bewise/__manifest__.py b/theme_bewise/__manifest__.py index 48a491e48..6b6ace4e1 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.0.0', + 'version': '2.1.0', 'author': 'Odoo S.A.', 'depends': ['theme_common'], 'data': [ @@ -15,8 +15,16 @@ ], 'images': [ 'static/description/bewise_description.jpg', - 'static/description/bewise_screenshot.jpeg', + '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_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', + }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-bewise.odoo.com', 'assets': { diff --git a/theme_bewise/data/ir_asset.xml b/theme_bewise/data/ir_asset.xml index e18e40be9..16a867c02 100644 --- a/theme_bewise/data/ir_asset.xml +++ b/theme_bewise/data/ir_asset.xml @@ -1,45 +1,41 @@ - + + theme_bewise.s_big_image_parallax_000_scss + Big image parallax 000 SCSS + web.assets_frontend + theme_bewise/static/src/old_snippets/s_big_image_parallax/000.scss + + - - theme_bewise.s_big_image_parallax_000_scss - Big image parallax 000 SCSS - web.assets_frontend - theme_bewise/static/src/old_snippets/s_big_image_parallax/000.scss - - + + theme_bewise.s_big_image_000_scss + Big image 000 SCSS + web.assets_frontend + theme_bewise/static/src/old_snippets/s_big_image/000.scss + + - - theme_bewise.s_big_image_000_scss - Big image 000 SCSS - web.assets_frontend - theme_bewise/static/src/old_snippets/s_big_image/000.scss - - + + theme_bewise.s_icon_box_000_scss + Icon box 000 SCSS + web.assets_frontend + theme_bewise/static/src/old_snippets/s_icon_box/000.scss + + - - theme_bewise.s_icon_box_000_scss - Icon box 000 SCSS - web.assets_frontend - theme_bewise/static/src/old_snippets/s_icon_box/000.scss - - + + theme_bewise.s_big_icons_000_scss + Big icons 000 SCSS + web.assets_frontend + theme_bewise/static/src/old_snippets/s_big_icons/000.scss + + - - theme_bewise.s_big_icons_000_scss - Big icons 000 SCSS - web.assets_frontend - theme_bewise/static/src/old_snippets/s_big_icons/000.scss - - - - - theme_bewise.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - theme_bewise/static/src/scss/primary_variables.scss - - - + + theme_bewise.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + theme_bewise/static/src/scss/primary_variables.scss + diff --git a/theme_bewise/static/description/bewise_description.jpg b/theme_bewise/static/description/bewise_description.jpg index d42d75fc2..d99bfbcd3 100644 Binary files a/theme_bewise/static/description/bewise_description.jpg and b/theme_bewise/static/description/bewise_description.jpg differ diff --git a/theme_bewise/static/description/bewise_screenshot.jpeg b/theme_bewise/static/description/bewise_screenshot.jpeg deleted file mode 100644 index 9526133ea..000000000 Binary files a/theme_bewise/static/description/bewise_screenshot.jpeg and /dev/null differ diff --git a/theme_bewise/static/description/bewise_screenshot.jpg b/theme_bewise/static/description/bewise_screenshot.jpg new file mode 100644 index 000000000..02599dc0b Binary files /dev/null and b/theme_bewise/static/description/bewise_screenshot.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_bg.jpg b/theme_bewise/static/src/img/backgrounds/college_bg.jpg index 042eb8613..00dcc5152 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_bg.jpg and b/theme_bewise/static/src/img/backgrounds/college_bg.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_bg_2.jpg b/theme_bewise/static/src/img/backgrounds/college_bg_2.jpg index 68f572518..5b5c5a5bf 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_bg_2.jpg and b/theme_bewise/static/src/img/backgrounds/college_bg_2.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_bg_3.jpg b/theme_bewise/static/src/img/backgrounds/college_bg_3.jpg index 1d5368903..39c7342e1 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_bg_3.jpg and b/theme_bewise/static/src/img/backgrounds/college_bg_3.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_bg_4.jpg b/theme_bewise/static/src/img/backgrounds/college_bg_4.jpg index d5a835890..f49b681f1 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_bg_4.jpg and b/theme_bewise/static/src/img/backgrounds/college_bg_4.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_bg_5.jpg b/theme_bewise/static/src/img/backgrounds/college_bg_5.jpg index 8a74f75b2..582509db7 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_bg_5.jpg and b/theme_bewise/static/src/img/backgrounds/college_bg_5.jpg differ diff --git a/theme_bewise/static/src/img/backgrounds/college_parallax.jpg b/theme_bewise/static/src/img/backgrounds/college_parallax.jpg index 25716570a..100e49143 100644 Binary files a/theme_bewise/static/src/img/backgrounds/college_parallax.jpg and b/theme_bewise/static/src/img/backgrounds/college_parallax.jpg differ diff --git a/theme_bewise/static/src/img/content/college_carousel_1.jpg b/theme_bewise/static/src/img/content/college_carousel_1.jpg index f8147d638..d6cada891 100644 Binary files a/theme_bewise/static/src/img/content/college_carousel_1.jpg and b/theme_bewise/static/src/img/content/college_carousel_1.jpg differ diff --git a/theme_bewise/static/src/img/content/college_carousel_2.jpg b/theme_bewise/static/src/img/content/college_carousel_2.jpg index 5f2aa5837..cd751fe3a 100644 Binary files a/theme_bewise/static/src/img/content/college_carousel_2.jpg and b/theme_bewise/static/src/img/content/college_carousel_2.jpg differ diff --git a/theme_bewise/static/src/img/content/college_carousel_3.jpg b/theme_bewise/static/src/img/content/college_carousel_3.jpg index 65b96b50c..4fd5c47a6 100644 Binary files a/theme_bewise/static/src/img/content/college_carousel_3.jpg and b/theme_bewise/static/src/img/content/college_carousel_3.jpg differ diff --git a/theme_bewise/static/src/img/content/college_graduate.jpg b/theme_bewise/static/src/img/content/college_graduate.jpg index 6e923f438..0811f8b42 100644 Binary files a/theme_bewise/static/src/img/content/college_graduate.jpg and b/theme_bewise/static/src/img/content/college_graduate.jpg differ diff --git a/theme_bewise/static/src/img/content/college_graduate_2.jpg b/theme_bewise/static/src/img/content/college_graduate_2.jpg index dfad84021..b9300d6fe 100644 Binary files a/theme_bewise/static/src/img/content/college_graduate_2.jpg and b/theme_bewise/static/src/img/content/college_graduate_2.jpg differ diff --git a/theme_bewise/static/src/img/content/college_lab.jpg b/theme_bewise/static/src/img/content/college_lab.jpg index dfd9df9be..c425e88ba 100644 Binary files a/theme_bewise/static/src/img/content/college_lab.jpg and b/theme_bewise/static/src/img/content/college_lab.jpg differ diff --git a/theme_bewise/static/src/img/content/college_lab_2.jpg b/theme_bewise/static/src/img/content/college_lab_2.jpg new file mode 100644 index 000000000..51f08c7ad Binary files /dev/null and b/theme_bewise/static/src/img/content/college_lab_2.jpg differ diff --git a/theme_bewise/static/src/img/content/college_lab_2.png b/theme_bewise/static/src/img/content/college_lab_2.png deleted file mode 100644 index c47dc6516..000000000 Binary files a/theme_bewise/static/src/img/content/college_lab_2.png and /dev/null differ diff --git a/theme_bewise/static/src/img/content/college_library.jpg b/theme_bewise/static/src/img/content/college_library.jpg index 2a3c6f397..c1740981c 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/img/content/college_media_1.jpg b/theme_bewise/static/src/img/content/college_media_1.jpg index 6c4d61e2f..b01a97935 100644 Binary files a/theme_bewise/static/src/img/content/college_media_1.jpg and b/theme_bewise/static/src/img/content/college_media_1.jpg differ diff --git a/theme_bewise/static/src/img/content/college_media_2.jpg b/theme_bewise/static/src/img/content/college_media_2.jpg index 9acfb576d..716c1c615 100644 Binary files a/theme_bewise/static/src/img/content/college_media_2.jpg and b/theme_bewise/static/src/img/content/college_media_2.jpg differ diff --git a/theme_bewise/static/src/img/content/college_media_3.jpg b/theme_bewise/static/src/img/content/college_media_3.jpg index c27461e53..90ddbd252 100644 Binary files a/theme_bewise/static/src/img/content/college_media_3.jpg and b/theme_bewise/static/src/img/content/college_media_3.jpg differ diff --git a/theme_bewise/static/src/img/content/college_students.jpg b/theme_bewise/static/src/img/content/college_students.jpg index 1a81bf076..42f8c0fe6 100644 Binary files a/theme_bewise/static/src/img/content/college_students.jpg and b/theme_bewise/static/src/img/content/college_students.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_25.jpg b/theme_bewise/static/src/img/content/content_img_25.jpg index 395d2a24e..6d4bcd586 100644 Binary files a/theme_bewise/static/src/img/content/content_img_25.jpg and b/theme_bewise/static/src/img/content/content_img_25.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_32.jpg b/theme_bewise/static/src/img/content/content_img_32.jpg index b4f208b91..6490c52ce 100644 Binary files a/theme_bewise/static/src/img/content/content_img_32.jpg and b/theme_bewise/static/src/img/content/content_img_32.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_33.jpg b/theme_bewise/static/src/img/content/content_img_33.jpg index 9433574b8..e52cdc581 100644 Binary files a/theme_bewise/static/src/img/content/content_img_33.jpg and b/theme_bewise/static/src/img/content/content_img_33.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_34.jpg b/theme_bewise/static/src/img/content/content_img_34.jpg index b1e3659dd..e085964c4 100644 Binary files a/theme_bewise/static/src/img/content/content_img_34.jpg and b/theme_bewise/static/src/img/content/content_img_34.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_35.jpg b/theme_bewise/static/src/img/content/content_img_35.jpg index e394332de..be2f668a8 100644 Binary files a/theme_bewise/static/src/img/content/content_img_35.jpg and b/theme_bewise/static/src/img/content/content_img_35.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_36.jpg b/theme_bewise/static/src/img/content/content_img_36.jpg index 32e43f91e..15466be82 100644 Binary files a/theme_bewise/static/src/img/content/content_img_36.jpg and b/theme_bewise/static/src/img/content/content_img_36.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_37.jpg b/theme_bewise/static/src/img/content/content_img_37.jpg index 98c02f428..c0a6a3609 100644 Binary files a/theme_bewise/static/src/img/content/content_img_37.jpg and b/theme_bewise/static/src/img/content/content_img_37.jpg differ diff --git a/theme_bewise/static/src/img/content/content_img_38.jpg b/theme_bewise/static/src/img/content/content_img_38.jpg index ccadeca82..9cf6f8758 100644 Binary files a/theme_bewise/static/src/img/content/content_img_38.jpg and b/theme_bewise/static/src/img/content/content_img_38.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_02.jpg b/theme_bewise/static/src/img/content/library_image_02.jpg new file mode 100644 index 000000000..6e6add2eb Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_02.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_03.jpg b/theme_bewise/static/src/img/content/library_image_03.jpg new file mode 100644 index 000000000..f34602958 Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_03.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_05.jpg b/theme_bewise/static/src/img/content/library_image_05.jpg new file mode 100644 index 000000000..b7b024a47 Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_05.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_08.jpg b/theme_bewise/static/src/img/content/library_image_08.jpg new file mode 100644 index 000000000..8f5ae46e2 Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_08.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_10.jpg b/theme_bewise/static/src/img/content/library_image_10.jpg new file mode 100644 index 000000000..56c6a3268 Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_10.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_14.jpg b/theme_bewise/static/src/img/content/library_image_14.jpg new file mode 100644 index 000000000..3be6f71ab Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_14.jpg differ diff --git a/theme_bewise/static/src/img/content/library_image_16.jpg b/theme_bewise/static/src/img/content/library_image_16.jpg new file mode 100644 index 000000000..96dc30b73 Binary files /dev/null and b/theme_bewise/static/src/img/content/library_image_16.jpg differ diff --git a/theme_bewise/static/src/img/content/s_popup.jpg b/theme_bewise/static/src/img/content/s_popup.jpg index 9af0aef4c..83911f1cc 100644 Binary files a/theme_bewise/static/src/img/content/s_popup.jpg and b/theme_bewise/static/src/img/content/s_popup.jpg differ diff --git a/theme_bewise/static/src/img/content/uiface_1.jpg b/theme_bewise/static/src/img/content/uiface_1.jpg index cdab1cc01..4361929cc 100644 Binary files a/theme_bewise/static/src/img/content/uiface_1.jpg and b/theme_bewise/static/src/img/content/uiface_1.jpg differ diff --git a/theme_bewise/static/src/img/content/uiface_2.jpg b/theme_bewise/static/src/img/content/uiface_2.jpg index 70caa4969..2a14c1375 100644 Binary files a/theme_bewise/static/src/img/content/uiface_2.jpg and b/theme_bewise/static/src/img/content/uiface_2.jpg differ diff --git a/theme_bewise/static/src/img/content/uiface_3.jpg b/theme_bewise/static/src/img/content/uiface_3.jpg index 1b3fe0407..42f20180e 100644 Binary files a/theme_bewise/static/src/img/content/uiface_3.jpg and b/theme_bewise/static/src/img/content/uiface_3.jpg differ diff --git a/theme_bewise/static/src/img/content/uiface_4.jpg b/theme_bewise/static/src/img/content/uiface_4.jpg index da339c990..a78ac572b 100644 Binary files a/theme_bewise/static/src/img/content/uiface_4.jpg and b/theme_bewise/static/src/img/content/uiface_4.jpg differ diff --git a/theme_bewise/static/src/js/tour.js b/theme_bewise/static/src/js/tour.js index 25797b2d6..b15454dbf 100644 --- a/theme_bewise/static/src/js/tour.js +++ b/theme_bewise/static/src/js/tour.js @@ -1,12 +1,9 @@ -odoo.define("theme_bewise.tour.bewise", function (require) { -"use strict"; +/** @odoo-module */ +import wTourUtils from 'website.tour_utils'; const core = require("web.core"); const _t = core._t; -const wTourUtils = require("website.tour_utils"); -var tour = require("web_tour.tour"); - const snippets = [ { id: 's_cover', @@ -33,8 +30,8 @@ const snippets = [ name: 'Quotes', }, { - id: 's_company_team', - name: 'Team', + id: 's_color_blocks_2', + name: 'Big Boxes', }, ]; @@ -45,11 +42,11 @@ wTourUtils.registerThemeHomepageTour("bewise_tour", [ wTourUtils.dragNDrop(snippets[1], 'top'), wTourUtils.dragNDrop(snippets[2], 'top'), wTourUtils.dragNDrop(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.dragNDrop(snippets[4], 'top'), wTourUtils.dragNDrop(snippets[5], 'top'), wTourUtils.dragNDrop(snippets[6], 'top'), - wTourUtils.clickOnSnippet(snippets[6], 'top'), - wTourUtils.changeOption('BackgroundShape', 'we-toggler', _t('Background Shape')), - wTourUtils.selectNested('we-select-page', 'BackgroundShape', ':not(.o_we_pager_controls)', _t('Background Shape')), ]); -}); diff --git a/theme_bewise/static/src/scss/primary_variables.scss b/theme_bewise/static/src/scss/primary_variables.scss index 12a102585..431f8c608 100644 --- a/theme_bewise/static/src/scss/primary_variables.scss +++ b/theme_bewise/static/src/scss/primary_variables.scss @@ -41,12 +41,12 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (48.83 / 16); -$o-theme-h2-font-size-multiplier: (39.06 / 16); -$o-theme-h3-font-size-multiplier: (31.25 / 16); -$o-theme-h4-font-size-multiplier: (25.00 / 16); -$o-theme-h5-font-size-multiplier: (20.00 / 16); -$o-theme-h6-font-size-multiplier: 1.1; +$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: ( 'Lato': ( @@ -105,7 +105,7 @@ $o-website-values-palettes: ( 'header-font-size': (20 / 16) * 1rem, 'font': 'Darker Grotesque', - 'font-size-base': 1.2rem, + 'font-size-base': 1.3125rem, 'headings-font': 'Raleway', 'navbar-font': 'Darker Grotesque', 'buttons-font': 'Darker Grotesque', @@ -155,4 +155,7 @@ $o-theme-color-palettes-compatibility-indexes: ( // Shapes //------------------------------------------------------------------------------ -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/11', (1: 5)); +$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 72e555a3a..60f296b79 100644 --- a/theme_bewise/views/customizations.xml +++ b/theme_bewise/views/customizations.xml @@ -2,48 +2,84 @@ -