diff --git a/theme_monglia/__manifest__.py b/theme_monglia/__manifest__.py index 2447f5e6b..d9152cd64 100644 --- a/theme_monglia/__manifest__.py +++ b/theme_monglia/__manifest__.py @@ -15,7 +15,7 @@ ], 'images': [ 'static/description/monglia_description.png', - 'static/description/monglia_screenshot.jpeg', + 'static/description/monglia_screenshot.jpg', ], 'images_preview_theme': { 'website.s_cover_default_image': '/theme_monglia/static/src/img/snippets/s_cover.jpg', @@ -32,10 +32,10 @@ 'website.library_image_02': '/theme_monglia/static/src/img/snippets/library_image_05.jpg', 'website.library_image_14': '/theme_monglia/static/src/img/snippets/library_image_14.jpg', 'website.library_image_16': '/theme_monglia/static/src/img/snippets/library_image_16.jpg', + 'website.s_masonry_block_default_image_1': '/theme_monglia/static/src/img/snippets/s_masonry_block.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_title', 's_text_block', 's_three_columns', 's_images_wall', - 's_title', 's_media_list', 's_text_image'], + 'homepage': ['s_cover', 's_numbers_grid', 's_company_team_shapes', 's_text_block', 's_freegrid', 's_cta_box', 's_shape_image', 's_title', 's_images_wall', 's_faq_collapse', 's_references'], }, 'new_page_templates': { 'about': { diff --git a/theme_monglia/static/description/monglia_description.png b/theme_monglia/static/description/monglia_description.png index aed35ced4..54a725979 100644 Binary files a/theme_monglia/static/description/monglia_description.png and b/theme_monglia/static/description/monglia_description.png differ diff --git a/theme_monglia/static/description/monglia_screenshot.jpeg b/theme_monglia/static/description/monglia_screenshot.jpeg deleted file mode 100644 index 8f335a23d..000000000 Binary files a/theme_monglia/static/description/monglia_screenshot.jpeg and /dev/null differ diff --git a/theme_monglia/static/description/monglia_screenshot.jpg b/theme_monglia/static/description/monglia_screenshot.jpg new file mode 100644 index 000000000..2c5f15460 Binary files /dev/null and b/theme_monglia/static/description/monglia_screenshot.jpg differ diff --git a/theme_monglia/static/description/theme_monglia.svg b/theme_monglia/static/description/theme_monglia.svg index 8b996861d..2ebba2be4 100644 --- a/theme_monglia/static/description/theme_monglia.svg +++ b/theme_monglia/static/description/theme_monglia.svg @@ -1,293 +1,290 @@ - - theme_monglia + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - + + + - - + + + - - - - - - - - - + + + + + + + + - - - - - - - Welcome - Message - - - - - - - - - - - - - - - - Discover - - + + + + + + + Welcome Message + - - - - - - - - - - - - - TITLE - BLOCK - - - - - - - - - - - - - - - - - - - BLOCK - TITLE - - + + - - - - Card Title - - - - - - - + + - - - - - - - - - - - Card Title - + + + - - - - - - - - - - - Card Title - + + + + + + + - - - - - - - + + + + + + + + + + Section Title + - - - - - - - - - - - - - Card Title - - - - - - - - - - - - - Card Title - - - - - - - - - - - - - Card Title - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - Discover - - - Block Title + + + + + + + + + + + + + + + + + + Section Title + + + - - - - - - - - - - - - - - - + + + + + + + + Section Title + + + + + - - - - - + + + + + Section title + + + + + + + + + + + + + + + Section title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Section title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_monglia/static/src/js/tour.js b/theme_monglia/static/src/js/tour.js index 8e6ab1642..6730ad08a 100644 --- a/theme_monglia/static/src/js/tour.js +++ b/theme_monglia/static/src/js/tour.js @@ -9,9 +9,14 @@ const snippets = [ groupName: "Intro", }, { - id: 's_title', - name: 'Title', - groupName: "Text", + id: 's_numbers_grid', + name: 'Numbers Grid', + groupName: "Content", + }, + { + id: 's_company_team_shapes', + name: 'Team Shapes', + groupName: "People", }, { id: 's_text_block', @@ -19,14 +24,19 @@ const snippets = [ groupName: "Text", }, { - id: 's_three_columns', - name: 'Columns', + id: 's_freegrid', + name: 'Free grid', groupName: "Columns", }, { - id: 's_images_wall', - name: 'Images Wall', - groupName: "Images", + id: 's_cta_box', + name: 'Box Call to Action', + groupName: "Content", + }, + { + id: 's_shape_image', + name: 'Shape image', + groupName: "Content", }, { id: 's_title', @@ -34,19 +44,24 @@ const snippets = [ groupName: "Text", }, { - id: 's_media_list', - name: 'Media List', - groupName: "Content", + id: 's_images_wall', + name: 'Images Wall', + groupName: "Images", }, { - id: 's_text_image', - name: 'Text - Image', - groupName: "Content", + id: 's_faq_collapse', + name: 'FAQ', + groupName: "text", + }, + { + id: 's_references', + name: 'References', + groupName: "People", }, ]; wTourUtils.registerThemeHomepageTour("monglia_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"monglia-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-light-3"'), ...wTourUtils.insertSnippet(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), @@ -57,4 +72,7 @@ wTourUtils.registerThemeHomepageTour("monglia_tour", () => [ ...wTourUtils.insertSnippet(snippets[5]), ...wTourUtils.insertSnippet(snippets[6]), ...wTourUtils.insertSnippet(snippets[7]), + ...wTourUtils.insertSnippet(snippets[8]), + ...wTourUtils.insertSnippet(snippets[9]), + ...wTourUtils.insertSnippet(snippets[10]), ]); diff --git a/theme_monglia/static/src/scss/primary_variables.scss b/theme_monglia/static/src/scss/primary_variables.scss index f03475e19..5d7641e92 100644 --- a/theme_monglia/static/src/scss/primary_variables.scss +++ b/theme_monglia/static/src/scss/primary_variables.scss @@ -4,6 +4,10 @@ //------------------------------------------------------------------------------ // Theme colors +$default-light-3: map-get($o-color-palettes, 'default-light-3'); +$default-light-3: map-merge($default-light-3, ('body': 'o-color-2')); +$o-color-palettes: map-merge($o-color-palettes, ('default-light-3': $default-light-3)); + $o-theme-color-palettes: map-merge($o-theme-color-palettes, ( 'monglia-1': ( @@ -55,14 +59,16 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (48 / 14); -$o-theme-h2-font-size-multiplier: (36 / 14); -$o-theme-h3-font-size-multiplier: (30 / 14); -$o-theme-h4-font-size-multiplier: (24 / 14); -$o-theme-h5-font-size-multiplier: 1; -$o-theme-h6-font-size-multiplier: (12 / 14); $o-theme-font-configs: ( + 'Bungee': ( + 'family': ('Bungee', sans-serif), + 'url': 'Bungee:400', + ), + 'Roboto Mono': ( + 'family': ('Roboto Mono', monospace), + 'url': 'Roboto+Mono:300,300i,400,400i,700,700i', + ), 'Handlee': ( 'family': ('Handlee', cursive), 'url': 'Handlee:300,300i,400,400i,700,700i', @@ -135,27 +141,21 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'monglia-1', + 'color-palettes-name': 'default-light-3', - 'header-font-size': (20 / 16) * 1rem, - 'font': 'Roboto', - 'headings-font': 'Darker Grotesque', - 'navbar-font': 'Darker Grotesque', - 'buttons-font': 'Roboto', + 'layout': 'boxed', + 'font': 'Roboto Mono', + 'headings-font': 'Bungee', + 'navbar-font': 'Roboto Mono', + 'buttons-font': 'Roboto Mono', 'footer-template': 'minimalist', 'btn-border-radius': 0, 'btn-border-radius-sm': 0, 'btn-border-radius-lg': 0, - 'btn-padding-y': .474rem, - 'btn-padding-x': 1.25rem, - 'btn-padding-y-lg': .4rem, - 'btn-padding-x-lg': 2rem, ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'monglia-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'monglia-1', 2: 'monglia-2', diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml index c8dd0800c..7797300e8 100644 --- a/theme_monglia/views/customizations.xml +++ b/theme_monglia/views/customizations.xml @@ -3,27 +3,33 @@

MONGLIA 2024

- -

MAIN LINE UP

+ + + -