diff --git a/theme_treehouse/__manifest__.py b/theme_treehouse/__manifest__.py index 22d82698b..f71d0e521 100644 --- a/theme_treehouse/__manifest__.py +++ b/theme_treehouse/__manifest__.py @@ -29,10 +29,13 @@ 'views/snippets/s_key_images.xml', 'views/snippets/s_images_mosaic.xml', 'views/snippets/s_media_list.xml', + 'views/snippets/s_numbers_list.xml', 'views/snippets/s_picture.xml', 'views/snippets/s_freegrid.xml', 'views/snippets/s_quotes_carousel.xml', 'views/snippets/s_quotes_carousel_minimal.xml', + 'views/snippets/s_references.xml', + 'views/snippets/s_sidegrid.xml', 'views/snippets/s_tabs.xml', 'views/snippets/s_text_block.xml', 'views/snippets/s_text_image.xml', @@ -57,15 +60,20 @@ 'static/description/treehouse_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_cover_default_image': '/theme_treehouse/static/src/img/content/cover.jpg', + 'website.s_sidegrid_default_image_1': '/theme_treehouse/static/src/img/content/s_sidegrid_default_image_1.jpg', + 'website.s_sidegrid_default_image_2': '/theme_treehouse/static/src/img/content/s_sidegrid_default_image_2.jpg', + 'website.s_sidegrid_default_image_3': '/theme_treehouse/static/src/img/content/s_sidegrid_default_image_3.jpg', + 'website.s_sidegrid_default_image_4': '/theme_treehouse/static/src/img/content/s_sidegrid_default_image_4.jpg', 'website.s_text_image_default_image': '/theme_treehouse/static/src/img/content/text_image.jpg', - 'website.s_parallax_default_image': '/website/static/src/img/snippets_demo/s_parallax.jpg', - 'website.s_three_columns_default_image_1': '/theme_treehouse/static/src/img/content/three_columns_01.jpg', - 'website.s_three_columns_default_image_2': '/theme_treehouse/static/src/img/content/three_columns_02.jpg', - 'website.s_three_columns_default_image_3': '/theme_treehouse/static/src/img/content/three_columns_03.jpg', + 'website.library_image_03': '/theme_treehouse/static/src/img/backgrounds/05.jpg', + 'website.library_image_13': '/theme_treehouse/static/src/img/content/s_freegrid_default_image_2.jpg', + 'website.library_image_10': '/theme_treehouse/static/src/img/content/s_freegrid_default_image_3.jpg', + 'website.library_image_05': '/theme_treehouse/static/src/img/content/s_freegrid_default_image_4.jpg', + 'website.library_image_14': '/theme_treehouse/static/src/img/content/s_freegrid_default_image_5.jpg', + 'website.library_image_16': '/theme_treehouse/static/src/img/content/s_freegrid_default_image_6.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_text_image', 's_title', 's_three_columns', 's_call_to_action'], + 'homepage': ['s_sidegrid', 's_numbers_list', 's_color_blocks_2', 's_references', 's_freegrid'], }, 'new_page_templates': { 'about': { diff --git a/theme_treehouse/models/theme_treehouse.py b/theme_treehouse/models/theme_treehouse.py index f7780de0e..a54d89ffa 100644 --- a/theme_treehouse/models/theme_treehouse.py +++ b/theme_treehouse/models/theme_treehouse.py @@ -7,10 +7,10 @@ class ThemeTreehouse(models.AbstractModel): def _theme_treehouse_post_copy(self, mod): self.disable_view('website.header_visibility_standard') self.enable_view('website.header_visibility_fixed') + self.enable_view('website.template_header_vertical') - self.enable_view('website.template_footer_contact') + self.enable_view('website.template_footer_descriptive') self.enable_view('website.template_footer_slideout') - self.enable_view('website.option_footer_scrolltop') self.enable_asset("website.ripple_effect_scss") self.enable_asset("website.ripple_effect_js") diff --git a/theme_treehouse/static/description/theme_treehouse.svg b/theme_treehouse/static/description/theme_treehouse.svg index 4e6b9bfd8..b4fdc6c25 100644 --- a/theme_treehouse/static/description/theme_treehouse.svg +++ b/theme_treehouse/static/description/theme_treehouse.svg @@ -1,166 +1,177 @@ - - + - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - LOGO - - - - - - - Contact - + + + + + + + + + + + + + - - - - - - - Welcome - - - - - Discover - + + + + + + + + + + + - - - - - - Section Title - - - - - - Details - + + + + + + + + + + + + + + + + + + + + + - - - - - Section Title + + + + + + + + + + - - - - - - - Entry Title - - - - - - - - - - Entry Title - - - - - - - - - - Entry Title - - - - - - + + + + + + + + + + + - - - - - - Section Title - - - - - Contact - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - LOGO + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + diff --git a/theme_treehouse/static/description/treehouse_screenshot.jpg b/theme_treehouse/static/description/treehouse_screenshot.jpg index 472d93848..a768fc86d 100644 Binary files a/theme_treehouse/static/description/treehouse_screenshot.jpg and b/theme_treehouse/static/description/treehouse_screenshot.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_1.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_1.jpg new file mode 100644 index 000000000..2d5ba015b Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_1.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_2.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_2.jpg new file mode 100644 index 000000000..fc7da8c29 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_2.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_3.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_3.jpg new file mode 100644 index 000000000..36c8e19e6 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_3.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_4.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_4.jpg new file mode 100644 index 000000000..f72d70012 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_4.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_5.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_5.jpg new file mode 100644 index 000000000..3c1c91eb6 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_5.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_freegrid_default_image_6.jpg b/theme_treehouse/static/src/img/content/s_freegrid_default_image_6.jpg new file mode 100644 index 000000000..76f26b0fa Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_freegrid_default_image_6.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_sidegrid_default_image_1.jpg b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_1.jpg new file mode 100644 index 000000000..a67565d9e Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_1.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_sidegrid_default_image_2.jpg b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_2.jpg new file mode 100644 index 000000000..0ea771c3f Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_2.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_sidegrid_default_image_3.jpg b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_3.jpg new file mode 100644 index 000000000..6ececde92 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_3.jpg differ diff --git a/theme_treehouse/static/src/img/content/s_sidegrid_default_image_4.jpg b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_4.jpg new file mode 100644 index 000000000..0caf28bd8 Binary files /dev/null and b/theme_treehouse/static/src/img/content/s_sidegrid_default_image_4.jpg differ diff --git a/theme_treehouse/static/src/js/tour.js b/theme_treehouse/static/src/js/tour.js index 8758f0a2d..d1818fb45 100644 --- a/theme_treehouse/static/src/js/tour.js +++ b/theme_treehouse/static/src/js/tour.js @@ -4,34 +4,34 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_sidegrid', + name: 'Side grid', groupName: "Intro", }, { - id: 's_text_image', - name: 'Text - Image', + id: 's_numbers_list', + name: 'Numbers list', groupName: "Content", }, { - id: 's_title', - name: 'Title', - groupName: "Text", + id: 's_color_blocks_2', + name: 'Big Boxes', + groupName: "Content", }, { - id: 's_three_columns', - name: 'Columns', + id: 's_references', + name: 'References', + groupName: "People", + }, + { + id: 's_freegrid', + name: 'Free grid', groupName: "Columns", }, - { - id: 's_call_to_action', - name: 'Call to Action', - groupName: "Content", - }, ]; wTourUtils.registerThemeHomepageTour("treehouse_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"treehouse-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-28"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), diff --git a/theme_treehouse/static/src/scss/bootstrap_overridden.scss b/theme_treehouse/static/src/scss/bootstrap_overridden.scss index 3656dde7a..580df4f63 100644 --- a/theme_treehouse/static/src/scss/bootstrap_overridden.scss +++ b/theme_treehouse/static/src/scss/bootstrap_overridden.scss @@ -69,6 +69,7 @@ $btn-box-shadow: none !default; $input-color: o-color('o-cc1-text') !default; $input-placeholder-color: o-color('500') !default; +$input-box-shadow: none !default; // Cards diff --git a/theme_treehouse/static/src/scss/primary_variables.scss b/theme_treehouse/static/src/scss/primary_variables.scss index 2a2d816f5..7c1328f53 100644 --- a/theme_treehouse/static/src/scss/primary_variables.scss +++ b/theme_treehouse/static/src/scss/primary_variables.scss @@ -4,7 +4,7 @@ $o-website-values-palettes: ( ( - 'color-palettes-name': 'treehouse-1', + 'color-palettes-name': 'default-28', // Header 'logo-height': 2.75rem, @@ -159,7 +159,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'treehouse-1'); +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28'); $o-color-palettes-compatibility-indexes: ( 1: 'treehouse-1', diff --git a/theme_treehouse/views/images_library.xml b/theme_treehouse/views/images_library.xml index a691b8cfb..4fecbe185 100644 --- a/theme_treehouse/views/images_library.xml +++ b/theme_treehouse/views/images_library.xml @@ -479,5 +479,80 @@ website.s_text_cover_default_image /theme_treehouse/static/src/img/content/treehouse_cover.jpg + + website.s_sidegrid_default_image_1 + website.s_sidegrid_default_image_1 + /theme_treehouse/static/src/img/content/s_sidegrid_default_image_1.jpg + + + website.s_sidegrid_default_image_2 + website.s_sidegrid_default_image_2 + /theme_treehouse/static/src/img/content/s_sidegrid_default_image_2.jpg + + + website.s_sidegrid_default_image_3 + website.s_sidegrid_default_image_3 + /theme_treehouse/static/src/img/content/s_sidegrid_default_image_3.jpg + + + website.s_sidegrid_default_image_4 + website.s_sidegrid_default_image_4 + /theme_treehouse/static/src/img/content/s_sidegrid_default_image_4.jpg + + + website.library_image_13 + website.library_image_13 + /theme_treehouse/static/src/img/content/s_freegrid_default_image_2.jpg + + + website.library_image_10 + website.library_image_10 + /theme_treehouse/static/src/img/content/s_freegrid_default_image_3.jpg + + + website.library_image_05 + website.library_image_05 + /theme_treehouse/static/src/img/content/s_freegrid_default_image_4.jpg + + + website.library_image_14 + website.library_image_14 + /theme_treehouse/static/src/img/content/s_freegrid_default_image_5.jpg + + + website.library_image_16 + website.library_image_16 + /theme_treehouse/static/src/img/content/s_freegrid_default_image_6.jpg + + + website.s_text_cover_default_image + website.s_text_cover_default_image + /theme_treehouse/static/src/img/backgrounds/17.jpg + + + website.s_striped_top_default_image + website.s_striped_top_default_image + /theme_treehouse/static/src/img/content/three_columns_01.jpg + + + website.s_image_hexagonal_default_image + website.s_image_hexagonal_default_image + /theme_treehouse/static/src/img/backgrounds/05.jpg + + + website.s_image_hexagonal_default_image_1 + website.s_image_hexagonal_default_image_1 + /theme_treehouse/static/src/img/backgrounds/07.jpg + + + website.s_showcase_default_image + website.s_showcase_default_image + /theme_treehouse/static/src/img/content/three_columns_02.jpg + + + website.s_faq_horizontal_default_image_1 + website.s_faq_horizontal_default_image_1 + /theme_treehouse/static/src/img/backgrounds/15.jpg + diff --git a/theme_treehouse/views/snippets/s_color_blocks_2.xml b/theme_treehouse/views/snippets/s_color_blocks_2.xml index 41f62fb67..f201ae02e 100644 --- a/theme_treehouse/views/snippets/s_color_blocks_2.xml +++ b/theme_treehouse/views/snippets/s_color_blocks_2.xml @@ -4,12 +4,17 @@
+ Environmental protection is the practice of safeguarding the natural world from harmful human activities and preserving ecosystems for future generations. It involves efforts to reduce pollution, conserve biodiversity, and sustainably manage natural resources such as air, water, and soil. +
- +
diff --git a/theme_treehouse/views/snippets/s_freegrid.xml b/theme_treehouse/views/snippets/s_freegrid.xml index 559e9723e..4f9b82bb7 100644 --- a/theme_treehouse/views/snippets/s_freegrid.xml +++ b/theme_treehouse/views/snippets/s_freegrid.xml @@ -14,6 +14,25 @@ Be Part of the Change + + + + + + + + + + + + + + + + + + + diff --git a/theme_treehouse/views/snippets/s_numbers_list.xml b/theme_treehouse/views/snippets/s_numbers_list.xml new file mode 100644 index 000000000..62eb5b973 --- /dev/null +++ b/theme_treehouse/views/snippets/s_numbers_list.xml @@ -0,0 +1,57 @@ + + + + + + diff --git a/theme_treehouse/views/snippets/s_references.xml b/theme_treehouse/views/snippets/s_references.xml new file mode 100644 index 000000000..399341e6c --- /dev/null +++ b/theme_treehouse/views/snippets/s_references.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/theme_treehouse/views/snippets/s_sidegrid.xml b/theme_treehouse/views/snippets/s_sidegrid.xml new file mode 100644 index 000000000..8381c3e70 --- /dev/null +++ b/theme_treehouse/views/snippets/s_sidegrid.xml @@ -0,0 +1,23 @@ + + + + + +