diff --git a/theme_kiddo/__manifest__.py b/theme_kiddo/__manifest__.py index 427db4499..782e15da8 100644 --- a/theme_kiddo/__manifest__.py +++ b/theme_kiddo/__manifest__.py @@ -4,7 +4,7 @@ 'category': 'Theme/Retail', 'summary': 'Nursery, Toys, Games, Kids, Boys, Girls, Stores', 'sequence': 290, - 'version': '2.0.0', + 'version': '2.1.0', 'author': 'Odoo S.A.', 'depends': ['theme_common'], 'data': [ @@ -13,9 +13,10 @@ 'views/snippets/s_banner.xml', 'views/snippets/s_image_text.xml', + 'views/snippets/s_picture.xml', 'views/snippets/s_product_list.xml', - 'views/snippets/s_three_columns.xml', 'views/snippets/s_call_to_action.xml', + 'views/snippets/s_cover.xml', ], 'images': [ @@ -23,17 +24,8 @@ 'static/description/kiddo_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_banner_default_image': '/theme_kiddo/static/src/img/library/bg11.jpg', - 'website.s_image_text_default_image': '/theme_kiddo/static/src/img/content/content_img_14.jpg', - 'website.s_product_list_default_image_1': '/theme_kiddo/static/src/img/content/content_img_30.jpg', - 'website.s_product_list_default_image_2': '/theme_kiddo/static/src/img/content/content_img_31.jpg', - 'website.s_product_list_default_image_3': '/theme_kiddo/static/src/img/content/content_img_32.jpg', - 'website.s_product_list_default_image_4': '/theme_kiddo/static/src/img/content/content_img_33.jpg', - 'website.s_product_list_default_image_5': '/theme_kiddo/static/src/img/content/content_img_34.jpg', - 'website.s_product_list_default_image_6': '/theme_kiddo/static/src/img/content/content_img_35.jpg', - 's_three_columns_default_image_1': '/theme_kiddo/static/src/img/content/content_img_16.jpg', - 's_three_columns_default_image_2': '/theme_kiddo/static/src/img/content/content_img_17.jpg', - 's_three_columns_default_image_3': '/theme_kiddo/static/src/img/content/content_img_18.jpg', + 'website.s_banner_default_image': '/theme_kiddo/static/src/img/snippets/s_banner.jpg', + 'website.s_picture_default_image': '/theme_kiddo/static/src/img/content/content_img_15.jpg', }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-kiddo.odoo.com', diff --git a/theme_kiddo/data/ir_asset.xml b/theme_kiddo/data/ir_asset.xml index bfeb7a3a1..4696dc6c2 100644 --- a/theme_kiddo/data/ir_asset.xml +++ b/theme_kiddo/data/ir_asset.xml @@ -1,36 +1,34 @@ - - - theme_kiddo.s_discount_000_variables_scss - Discount 000 variables SCSS - web._assets_primary_variables - theme_kiddo/static/src/old_snippets/s_discount/000_variables.scss - - + + theme_kiddo.s_discount_000_variables_scss + Discount 000 variables SCSS + web._assets_primary_variables + theme_kiddo/static/src/old_snippets/s_discount/000_variables.scss + + - - theme_kiddo.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - theme_kiddo/static/src/scss/primary_variables.scss - + + theme_kiddo.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + theme_kiddo/static/src/scss/primary_variables.scss + - - theme_kiddo.secondary_variables_scss - Secondary variables SCSS - web._assets_secondary_variables - theme_kiddo/static/src/scss/secondary_variables.scss - + + theme_kiddo.secondary_variables_scss + Secondary variables SCSS + web._assets_secondary_variables + theme_kiddo/static/src/scss/secondary_variables.scss + - - theme_kiddo.bootstrap_overridden_scss - Bootstrap overridden SCSS - web._assets_frontend_helpers - prepend - theme_kiddo/static/src/scss/bootstrap_overridden.scss - + + theme_kiddo.bootstrap_overridden_scss + Bootstrap overridden SCSS + web._assets_frontend_helpers + prepend + theme_kiddo/static/src/scss/bootstrap_overridden.scss + - diff --git a/theme_kiddo/models/theme_kiddo.py b/theme_kiddo/models/theme_kiddo.py index 272dc433f..8b3d12619 100644 --- a/theme_kiddo/models/theme_kiddo.py +++ b/theme_kiddo/models/theme_kiddo.py @@ -5,11 +5,10 @@ class ThemeKiddo(models.AbstractModel): _inherit = 'theme.utils' def _theme_kiddo_post_copy(self, mod): - self.disable_view('website.template_header_default') - self.enable_view('website.template_header_centered_logo') + self.enable_view('website.template_header_default_align_right') self.disable_view('website.footer_custom') - self.enable_view('website.template_footer_minimalist') + self.enable_view('website.template_footer_descriptive') # For compatibility # self.enable_asset('theme_common.compatibility_saas_10_1') diff --git a/theme_kiddo/static/description/Kiddo_description.png b/theme_kiddo/static/description/Kiddo_description.png index d10e9a22d..095e7c0a7 100644 Binary files a/theme_kiddo/static/description/Kiddo_description.png and b/theme_kiddo/static/description/Kiddo_description.png differ diff --git a/theme_kiddo/static/description/kiddo_screenshot.jpg b/theme_kiddo/static/description/kiddo_screenshot.jpg index 22113fe89..81c003e75 100644 Binary files a/theme_kiddo/static/description/kiddo_screenshot.jpg and b/theme_kiddo/static/description/kiddo_screenshot.jpg differ diff --git a/theme_kiddo/static/src/img/snippets/s_banner.jpg b/theme_kiddo/static/src/img/snippets/s_banner.jpg new file mode 100644 index 000000000..f622be1bd Binary files /dev/null and b/theme_kiddo/static/src/img/snippets/s_banner.jpg differ diff --git a/theme_kiddo/static/src/img/snippets/s_image_text.svg b/theme_kiddo/static/src/img/snippets/s_image_text.svg new file mode 100644 index 000000000..e029f9d99 --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_image_text.svg @@ -0,0 +1,746 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_1.svg b/theme_kiddo/static/src/img/snippets/s_product_list_1.svg new file mode 100644 index 000000000..c217d4680 --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_2.svg b/theme_kiddo/static/src/img/snippets/s_product_list_2.svg new file mode 100644 index 000000000..3400229e0 --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_3.svg b/theme_kiddo/static/src/img/snippets/s_product_list_3.svg new file mode 100644 index 000000000..93580844f --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_4.svg b/theme_kiddo/static/src/img/snippets/s_product_list_4.svg new file mode 100644 index 000000000..ee64cff12 --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_5.svg b/theme_kiddo/static/src/img/snippets/s_product_list_5.svg new file mode 100644 index 000000000..cce55ef01 --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/img/snippets/s_product_list_6.svg b/theme_kiddo/static/src/img/snippets/s_product_list_6.svg new file mode 100644 index 000000000..55991f4bc --- /dev/null +++ b/theme_kiddo/static/src/img/snippets/s_product_list_6.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme_kiddo/static/src/js/tour.js b/theme_kiddo/static/src/js/tour.js index 5e07f61cf..9af18380c 100644 --- a/theme_kiddo/static/src/js/tour.js +++ b/theme_kiddo/static/src/js/tour.js @@ -1,10 +1,8 @@ -odoo.define("theme_kiddo.tour.kiddo", 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 = [ { @@ -16,12 +14,12 @@ const snippets = [ name: 'Image - Text', }, { - id: 's_product_list', - name: 'Items', + id: 's_picture', + name: 'Picture', }, { - id: 's_three_columns', - name: 'Columns', + id: 's_product_list', + name: 'Items', }, { id: 's_call_to_action', @@ -41,4 +39,3 @@ wTourUtils.registerThemeHomepageTour("kiddo_tour", [ wTourUtils.goBackToBlocks(), wTourUtils.dragNDrop(snippets[4]), ]); -}); diff --git a/theme_kiddo/static/src/scss/bootstrap_overridden.scss b/theme_kiddo/static/src/scss/bootstrap_overridden.scss index fc06b5525..c41bf19c6 100644 --- a/theme_kiddo/static/src/scss/bootstrap_overridden.scss +++ b/theme_kiddo/static/src/scss/bootstrap_overridden.scss @@ -1,7 +1,6 @@ // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". // Acceptable values are between 0 and 255. -// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255. $yiq-contrasted-threshold: 150 !default; // Shadow diff --git a/theme_kiddo/static/src/scss/primary_variables.scss b/theme_kiddo/static/src/scss/primary_variables.scss index 865371f63..8b9f24649 100644 --- a/theme_kiddo/static/src/scss/primary_variables.scss +++ b/theme_kiddo/static/src/scss/primary_variables.scss @@ -62,6 +62,10 @@ $o-theme-h5-font-size-multiplier: (20 / 14); $o-theme-h6-font-size-multiplier: (16 / 14); $o-theme-font-configs: ( + 'Varela Round': ( + 'family': ('Varela Round', sans-serif), + 'url': 'Varela+Round:300,300i,400,400i,600,600i', + ), 'Montserrat': ( 'family': ('Montserrat', sans-serif), // font update - Proxima -> Montserrat 'url': 'Montserrat:300,300i,400,400i,600,600i', @@ -118,31 +122,35 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'kiddo-1', + 'color-palettes-name': 'kiddo-3', 'font-size-base': (14 / 16) * 1.075rem, - 'header-font-size': 1.25rem, + 'header-font-size': 1.15rem, 'logo-height': 3rem, 'fixed-logo-height': 3rem, 'btn-border-radius': 2rem, - 'btn-padding-y': .75rem, - 'btn-padding-x': 1.75rem, + 'btn-border-radius-lg': 2rem, + 'btn-padding-y': .5rem, + 'btn-padding-x': 1.25rem, + 'btn-padding-y-lg': .75rem, + 'btn-padding-x-lg': 1.5rem, 'font': 'Montserrat', - 'headings-font': 'Bubblegum Sans', - 'navbar-font': 'Bubblegum Sans', - 'buttons-font': 'Bubblegum Sans', + 'headings-font': 'Varela Round', + 'navbar-font': 'Varela Round', + 'buttons-font': 'Varela Round', 'link-underline': 'never', - 'header-template': 'centered_logo', - 'footer-template': 'minimalist', + 'header-template': 'default', + 'footer-template': 'descriptive', + 'btn-primary-outline': true, ), ); $o-palette-priority-prefix: 'kiddo'; $o-color-palettes-compatibility-indexes: ( - 1: 'kiddo-1', + 1: 'kiddo-3', 2: 'kiddo-2', - 3: 'kiddo-3', + 3: 'kiddo-1', 4: 'kiddo-4', 5: 'generic-1', 6: 'generic-2', @@ -176,8 +184,6 @@ $o-gray-color-palettes-compatibility-indexes: ( // Shapes //------------------------------------------------------------------------------ -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/13', (4: 4)); -$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Wavy/13', 'second', (4: 3)); -$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Wavy/13_001', 'second', (1: 3)); -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/19', (5: 4)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/14_001', (3: 2, 4: rgba(0, 0, 0, 0))); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/16', (3: 3)); $o-bg-shapes: add-footer-shape-colors-mapping('web_editor', 'Wavy/22', (3: 'footer')); diff --git a/theme_kiddo/views/images_library.xml b/theme_kiddo/views/images_library.xml index b5fd60801..96b535d2d 100644 --- a/theme_kiddo/views/images_library.xml +++ b/theme_kiddo/views/images_library.xml @@ -1,175 +1,177 @@ - - - website.s_cover_default_image - website.s_cover_default_image - /theme_kiddo/static/src/img/library/bg12.jpg - - - website.s_banner_default_image - website.s_banner_default_image - /theme_kiddo/static/src/img/library/bg11.jpg - - - website.s_popup_default_image - website.s_popup_default_image - /theme_kiddo/static/src/img/content/s_popup.jpg - - - website.s_text_image_default_image - website.s_text_image_default_image - /theme_kiddo/static/src/img/content/content_img_13.jpg - - - website.s_image_text_default_image - website.s_image_text_default_image - /theme_kiddo/static/src/img/content/content_img_14.jpg - - - website.s_picture_default_image - website.s_picture_default_image - /theme_kiddo/static/src/img/content/content_img_15.jpg - - - website.library_image_11 - website.library_image_11 - /theme_kiddo/static/src/img/content/content_img_16.jpg - - - website.library_image_13 - website.library_image_13 - /theme_kiddo/static/src/img/content/content_img_17.jpg - - - website.library_image_07 - website.library_image_07 - /theme_kiddo/static/src/img/content/content_img_18.jpg - - - website.s_masonry_block_default_image_1 - website.s_masonry_block_default_image_1 - /theme_kiddo/static/src/img/content/content_img_19.jpg - - - website.s_carousel_default_image_1 - website.s_carousel_default_image_1 - /theme_kiddo/static/src/img/content/content_img_20.jpg - - - website.s_carousel_default_image_2 - website.s_carousel_default_image_2 - /theme_kiddo/static/src/img/content/content_img_21.jpg - - - website.s_carousel_default_image_3 - website.s_carousel_default_image_3 - /theme_kiddo/static/src/img/content/content_img_22.jpg - - - website.s_media_list_default_image_1 - website.s_media_list_default_image_1 - /theme_kiddo/static/src/img/content/content_img_23.jpg - - - website.s_media_list_default_image_2 - website.s_media_list_default_image_2 - /theme_kiddo/static/src/img/content/content_img_24.jpg - - - website.s_media_list_default_image_3 - website.s_media_list_default_image_3 - /theme_kiddo/static/src/img/content/content_img_25.jpg - - - website.s_parallax_default_image - website.s_parallax_default_image - /theme_kiddo/static/src/img/library/bg13.jpg - - - website.s_company_team_image_1 - website.s_company_team_image_1 - /theme_kiddo/static/src/img/content/content_img_26.jpg - - - website.s_company_team_image_2 - website.s_company_team_image_2 - /theme_kiddo/static/src/img/content/content_img_27.jpg - - - website.s_company_team_image_3 - website.s_company_team_image_3 - /theme_kiddo/static/src/img/content/content_img_28.jpg - - - website.s_company_team_image_4 - website.s_company_team_image_4 - /theme_kiddo/static/src/img/content/content_img_29.jpg - - - website.s_product_list_default_image_1 - website.s_product_list_default_image_1 - /theme_kiddo/static/src/img/content/content_img_30.jpg - - - website.s_product_list_default_image_2 - website.s_product_list_default_image_2 - /theme_kiddo/static/src/img/content/content_img_31.jpg - - - website.s_product_list_default_image_3 - website.s_product_list_default_image_3 - /theme_kiddo/static/src/img/content/content_img_32.jpg - - - website.s_product_list_default_image_4 - website.s_product_list_default_image_4 - /theme_kiddo/static/src/img/content/content_img_33.jpg - - - website.s_product_list_default_image_5 - website.s_product_list_default_image_5 - /theme_kiddo/static/src/img/content/content_img_34.jpg - - - website.s_product_list_default_image_6 - website.s_product_list_default_image_6 - /theme_kiddo/static/src/img/content/content_img_35.jpg - - - website.s_quotes_carousel_demo_image_1 - website.s_quotes_carousel_demo_image_1 - /theme_kiddo/static/src/img/content/content_img_36.jpg - - - website.s_quotes_carousel_demo_image_2 - website.s_quotes_carousel_demo_image_2 - /theme_kiddo/static/src/img/content/content_img_37.jpg - - - website.s_quotes_carousel_demo_image_3 - website.s_quotes_carousel_demo_image_3 - /theme_kiddo/static/src/img/content/content_img_28.jpg - - - website.s_quotes_carousel_demo_image_4 - website.s_quotes_carousel_demo_image_4 - /theme_kiddo/static/src/img/content/content_img_26.jpg - - - website.s_quotes_carousel_demo_image_5 - website.s_quotes_carousel_demo_image_5 - /theme_kiddo/static/src/img/content/content_img_27.jpg - - - website.library_image_17 - website.library_image_17 - /theme_kiddo/static/src/img/content/content_img_38.jpg - - - theme_common.image_content_10 - theme_common.image_content_10 - /theme_kiddo/static/src/img/content/content_img_26.jpg - + + + website.s_cover_default_image + website.s_cover_default_image + /theme_kiddo/static/src/img/library/bg12.jpg + + + website.s_banner_default_image + website.s_banner_default_image + /theme_kiddo/static/src/img/snippets/s_banner.jpg + + + website.s_popup_default_image + website.s_popup_default_image + /theme_kiddo/static/src/img/content/s_popup.jpg + + + website.s_text_image_default_image + website.s_text_image_default_image + /theme_kiddo/static/src/img/content/content_img_13.jpg + + + website.s_image_text_default_image + website.s_image_text_default_image + /theme_kiddo/static/src/img/snippets/s_image_text.svg + + + website.s_picture_default_image + website.s_picture_default_image + /theme_kiddo/static/src/img/content/content_img_15.jpg + + + website.library_image_11 + website.library_image_11 + /theme_kiddo/static/src/img/content/content_img_16.jpg + + + website.library_image_13 + website.library_image_13 + /theme_kiddo/static/src/img/content/content_img_17.jpg + + + website.library_image_07 + website.library_image_07 + /theme_kiddo/static/src/img/content/content_img_18.jpg + + + website.s_masonry_block_default_image_1 + website.s_masonry_block_default_image_1 + /theme_kiddo/static/src/img/content/content_img_19.jpg + + + website.s_carousel_default_image_1 + website.s_carousel_default_image_1 + /theme_kiddo/static/src/img/content/content_img_20.jpg + + + website.s_carousel_default_image_2 + website.s_carousel_default_image_2 + /theme_kiddo/static/src/img/content/content_img_21.jpg + + + website.s_carousel_default_image_3 + website.s_carousel_default_image_3 + /theme_kiddo/static/src/img/content/content_img_22.jpg + + + website.s_media_list_default_image_1 + website.s_media_list_default_image_1 + /theme_kiddo/static/src/img/content/content_img_23.jpg + + + website.s_media_list_default_image_2 + website.s_media_list_default_image_2 + /theme_kiddo/static/src/img/content/content_img_24.jpg + + + website.s_media_list_default_image_3 + website.s_media_list_default_image_3 + /theme_kiddo/static/src/img/content/content_img_25.jpg + + + website.s_parallax_default_image + website.s_parallax_default_image + /theme_kiddo/static/src/img/library/bg13.jpg + + + website.s_company_team_image_1 + website.s_company_team_image_1 + /theme_kiddo/static/src/img/content/content_img_26.jpg + + + website.s_company_team_image_2 + website.s_company_team_image_2 + /theme_kiddo/static/src/img/content/content_img_27.jpg + + + website.s_company_team_image_3 + website.s_company_team_image_3 + /theme_kiddo/static/src/img/content/content_img_28.jpg + + + website.s_company_team_image_4 + website.s_company_team_image_4 + /theme_kiddo/static/src/img/content/content_img_29.jpg + + + + website.s_product_list_default_image_1 + website.s_product_list_default_image_1 + /theme_kiddo/static/src/img/snippets/s_product_list_1.svg + + + website.s_product_list_default_image_2 + website.s_product_list_default_image_2 + /theme_kiddo/static/src/img/snippets/s_product_list_2.svg + + + website.s_product_list_default_image_3 + website.s_product_list_default_image_3 + /theme_kiddo/static/src/img/snippets/s_product_list_3.svg + + + website.s_product_list_default_image_4 + website.s_product_list_default_image_4 + /theme_kiddo/static/src/img/snippets/s_product_list_4.svg + + + website.s_product_list_default_image_5 + website.s_product_list_default_image_5 + /theme_kiddo/static/src/img/snippets/s_product_list_5.svg + + + website.s_product_list_default_image_6 + website.s_product_list_default_image_6 + /theme_kiddo/static/src/img/snippets/s_product_list_6.svg + + + website.s_quotes_carousel_demo_image_1 + website.s_quotes_carousel_demo_image_1 + /theme_kiddo/static/src/img/content/content_img_36.jpg + + + website.s_quotes_carousel_demo_image_2 + website.s_quotes_carousel_demo_image_2 + /theme_kiddo/static/src/img/content/content_img_37.jpg + + + website.s_quotes_carousel_demo_image_3 + website.s_quotes_carousel_demo_image_3 + /theme_kiddo/static/src/img/content/content_img_28.jpg + + + website.s_quotes_carousel_demo_image_4 + website.s_quotes_carousel_demo_image_4 + /theme_kiddo/static/src/img/content/content_img_26.jpg + + + website.s_quotes_carousel_demo_image_5 + website.s_quotes_carousel_demo_image_5 + /theme_kiddo/static/src/img/content/content_img_27.jpg + + + website.library_image_17 + website.library_image_17 + /theme_kiddo/static/src/img/content/content_img_38.jpg + + + theme_common.image_content_10 + theme_common.image_content_10 + /theme_kiddo/static/src/img/content/content_img_26.jpg + + diff --git a/theme_kiddo/views/snippets/s_banner.xml b/theme_kiddo/views/snippets/s_banner.xml index 861957daf..455275581 100644 --- a/theme_kiddo/views/snippets/s_banner.xml +++ b/theme_kiddo/views/snippets/s_banner.xml @@ -1,23 +1,37 @@ - + + + diff --git a/theme_kiddo/views/snippets/s_call_to_action.xml b/theme_kiddo/views/snippets/s_call_to_action.xml index d1899d2d6..58b56ca7c 100644 --- a/theme_kiddo/views/snippets/s_call_to_action.xml +++ b/theme_kiddo/views/snippets/s_call_to_action.xml @@ -1,25 +1,27 @@ - + + + diff --git a/theme_kiddo/views/snippets/s_cover.xml b/theme_kiddo/views/snippets/s_cover.xml new file mode 100644 index 000000000..da41e66bb --- /dev/null +++ b/theme_kiddo/views/snippets/s_cover.xml @@ -0,0 +1,50 @@ + + + + + + diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml index 411bb0384..2a096e963 100644 --- a/theme_kiddo/views/snippets/s_image_text.xml +++ b/theme_kiddo/views/snippets/s_image_text.xml @@ -1,33 +1,29 @@ - + + + diff --git a/theme_kiddo/views/snippets/s_picture.xml b/theme_kiddo/views/snippets/s_picture.xml new file mode 100644 index 000000000..337506c0f --- /dev/null +++ b/theme_kiddo/views/snippets/s_picture.xml @@ -0,0 +1,33 @@ + + + + + + diff --git a/theme_kiddo/views/snippets/s_product_list.xml b/theme_kiddo/views/snippets/s_product_list.xml index 4565a26c4..59fe67560 100644 --- a/theme_kiddo/views/snippets/s_product_list.xml +++ b/theme_kiddo/views/snippets/s_product_list.xml @@ -1,79 +1,76 @@ - + diff --git a/theme_kiddo/views/snippets/s_three_columns.xml b/theme_kiddo/views/snippets/s_three_columns.xml deleted file mode 100644 index af31d2f27..000000000 --- a/theme_kiddo/views/snippets/s_three_columns.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - -