diff --git a/theme_loftspace/__manifest__.py b/theme_loftspace/__manifest__.py index d7bc2c157..e2c0c29dd 100644 --- a/theme_loftspace/__manifest__.py +++ b/theme_loftspace/__manifest__.py @@ -44,6 +44,11 @@ 'views/snippets/s_striped_center_top.xml', 'views/snippets/s_key_images.xml', 'views/snippets/s_quadrant.xml', + 'views/snippets/s_striped.xml', + 'views/snippets/s_text_block.xml', + 'views/snippets/s_features.xml', + 'views/snippets/s_faq_collapse.xml', + 'views/snippets/s_quotes_carousel.xml', 'views/snippets/s_big_number.xml', 'views/snippets/s_wavy_grid.xml', 'views/snippets/s_text_cover.xml', @@ -55,20 +60,24 @@ 'static/description/loftspace_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_cover_default_image': '/theme_loftspace/static/src/img/snippets/s_cover.jpg', - 'website.s_banner_default_image': '/theme_loftspace/static/src/img/snippets/s_banner.jpg', - 'website.s_three_columns_default_image_1': '/theme_loftspace/static/src/img/snippets/library_image_11.jpg', - 'website.s_three_columns_default_image_2': '/theme_loftspace/static/src/img/snippets/library_image_13.jpg', + 'website.s_image_text_default_image': '/theme_loftspace/static/src/img/snippets/s_image_text.jpg', + 'website.s_product_list_default_image_1': '/theme_loftspace/static/src/img/snippets/s_product_1.jpg', + 'website.s_picture_default_image': '/theme_loftspace/static/src/img/snippets/s_picture.jpg', + 'website.s_media_list_default_image_1': '/theme_loftspace/static/src/img/snippets/s_media_list_1.jpg', + 'website.s_media_list_default_image_2': '/theme_loftspace/static/src/img/snippets/s_media_list_2.jpg', + 'website.s_text_image_default_image': '/theme_loftspace/static/src/img/snippets/s_text_image.jpg', + 'website.s_cta_box_default_image': '/theme_loftspace/static/src/img/content/s_cta_box_default_image.jpg', 'website.s_three_columns_default_image_3': '/theme_loftspace/static/src/img/snippets/library_image_07.jpg', 'website.library_image_03': '/theme_loftspace/static/src/img/snippets/s_images_wall_01.jpg', 'website.library_image_02': '/theme_loftspace/static/src/img/snippets/s_images_wall_05.jpg', 'website.library_image_10': '/theme_loftspace/static/src/img/snippets/s_images_wall_06.jpg', 'website.library_image_05': '/theme_loftspace/static/src/img/snippets/s_images_wall_02.jpg', + 'website.library_image_07': '/theme_loftspace/static/src/img/snippets/library_image_07.jpg', 'website.library_image_16': '/theme_loftspace/static/src/img/snippets/s_images_wall_04.jpg', 'website.library_image_13': '/theme_loftspace/static/src/img/snippets/s_images_wall_03.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_three_columns', 's_title', 's_images_wall', 's_call_to_action'], + 'homepage': ['s_banner', 's_text_block', 's_striped', 's_key_images', 's_features', 's_quotes_carousel', 's_faq_collapse', 's_cta_box',], }, 'new_page_templates': { 'about': { diff --git a/theme_loftspace/static/description/loftspace_description.jpg b/theme_loftspace/static/description/loftspace_description.jpg index acb62427e..3b8ff01d5 100644 Binary files a/theme_loftspace/static/description/loftspace_description.jpg and b/theme_loftspace/static/description/loftspace_description.jpg differ diff --git a/theme_loftspace/static/description/loftspace_screenshot.jpg b/theme_loftspace/static/description/loftspace_screenshot.jpg index efc208bc1..be3de92d1 100644 Binary files a/theme_loftspace/static/description/loftspace_screenshot.jpg and b/theme_loftspace/static/description/loftspace_screenshot.jpg differ diff --git a/theme_loftspace/static/description/theme_loftspace.svg b/theme_loftspace/static/description/theme_loftspace.svg index dda4e1ffb..5b800f795 100644 --- a/theme_loftspace/static/description/theme_loftspace.svg +++ b/theme_loftspace/static/description/theme_loftspace.svg @@ -1,189 +1,260 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + - - - + + + - - - + + + - - + + + + - - - - - - - - - + + + + + + + + + LOGO + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + Contact Us + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Section + + title + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + “A quote about + + + your services” + + + - - - - - - - - - - - - - - - - - + + + + + Entry Title + + + - - - - - + + + Entry Title + + + + + + + Entry Title + + + + + + + Entry Title + + + + + + Section title + + - - - - - - - - - - - + + + + + + + + + Entry Title + + - - - - - + + + + Entry Title + + - - - - - + + + + Entry Title + + - - - - - - - + + + + Entry Title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Entry Title + + + + + + + + Welcome + + + Message + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_loftspace/static/src/img/snippets/s_banner_2.jpg b/theme_loftspace/static/src/img/snippets/s_banner_2.jpg index d6044ff51..106a144b5 100644 Binary files a/theme_loftspace/static/src/img/snippets/s_banner_2.jpg and b/theme_loftspace/static/src/img/snippets/s_banner_2.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_banner_3.jpg b/theme_loftspace/static/src/img/snippets/s_banner_3.jpg index db17d7850..d9e6c1b16 100644 Binary files a/theme_loftspace/static/src/img/snippets/s_banner_3.jpg and b/theme_loftspace/static/src/img/snippets/s_banner_3.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_cta_box_default_image.jpg b/theme_loftspace/static/src/img/snippets/s_cta_box_default_image.jpg new file mode 100644 index 000000000..05f377958 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_cta_box_default_image.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_key_images_default_image_1.jpg b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_1.jpg new file mode 100644 index 000000000..329f14c70 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_1.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_key_images_default_image_2.jpg b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_2.jpg new file mode 100644 index 000000000..4b6a62f18 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_2.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_key_images_default_image_3.jpg b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_3.jpg new file mode 100644 index 000000000..16c9d2e18 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_3.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_key_images_default_image_4.jpg b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_4.jpg new file mode 100644 index 000000000..60cefcbd8 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_key_images_default_image_4.jpg differ diff --git a/theme_loftspace/static/src/img/snippets/s_text_cover_default_image.jpg b/theme_loftspace/static/src/img/snippets/s_text_cover_default_image.jpg new file mode 100644 index 000000000..b68bc56b3 Binary files /dev/null and b/theme_loftspace/static/src/img/snippets/s_text_cover_default_image.jpg differ diff --git a/theme_loftspace/static/src/js/tour.js b/theme_loftspace/static/src/js/tour.js index 1733d0bf7..2d5018027 100644 --- a/theme_loftspace/static/src/js/tour.js +++ b/theme_loftspace/static/src/js/tour.js @@ -4,28 +4,43 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_banner', + name: 'Banner', groupName: "Intro", }, { - id: 's_three_columns', - name: 'Columns', - groupName: "Columns", - }, - { - id: 's_title', - name: 'Title', + id: 's_text_block', + name: 'Text', groupName: "Text", }, { - id: 's_images_wall', - name: 'Images Wall', - groupName: "Images", + id: 's_striped', + name: 'Striped section', + groupName: "Content", }, { - id: 's_call_to_action', - name: 'Call to Action', + id: 's_key_images', + name: 'Key Images', + groupName: "Columns", + }, + { + id: 's_features', + name: 'Features', + groupName: "Content", + }, + { + id: 's_quotes_carousel', + name: 'Quotes', + groupName: "People", + }, + { + id: 's_faq_collapse', + name: 'FAQ Block', + groupName: "Text", + }, + { + id: 's_cta_box', + name: 'Box Call to Action', groupName: "Content", }, ]; @@ -39,6 +54,10 @@ wTourUtils.registerThemeHomepageTour("loftspace_tour", () => [ ...wTourUtils.dragNDrop(snippets[2]), ...wTourUtils.dragNDrop(snippets[3]), ...wTourUtils.dragNDrop(snippets[4]), + ...wTourUtils.dragNDrop(snippets[5]), + ...wTourUtils.dragNDrop(snippets[6]), + ...wTourUtils.dragNDrop(snippets[7]), + ...wTourUtils.dragNDrop(snippets[8]), ...wTourUtils.clickOnSnippet(snippets[4]), wTourUtils.changeBackgroundColor(), wTourUtils.selectColorPalette(), diff --git a/theme_loftspace/views/images_content.xml b/theme_loftspace/views/images_content.xml index f9e382d28..41455cf6b 100644 --- a/theme_loftspace/views/images_content.xml +++ b/theme_loftspace/views/images_content.xml @@ -329,22 +329,22 @@ Check in primary_variables.scss and theme.scss --> website.s_key_images_default_image_1 website.s_key_images_default_image_1 - /theme_loftspace/static/src/img/snippets/s_images_wall_01.jpg + /theme_loftspace/static/src/img/snippets/s_key_images_default_image_1.jpg website.s_key_images_default_image_2 website.s_key_images_default_image_2 - /theme_loftspace/static/src/img/snippets/library_image_11.jpg + /theme_loftspace/static/src/img/snippets/s_key_images_default_image_2.jpg website.s_key_images_default_image_3 website.s_key_images_default_image_3 - /theme_loftspace/static/src/img/snippets/s_images_wall_05.jpg + /theme_loftspace/static/src/img/snippets/s_key_images_default_image_3.jpg website.s_key_images_default_image_4 website.s_key_images_default_image_4 - /theme_loftspace/static/src/img/snippets/library_image_13.jpg + /theme_loftspace/static/src/img/snippets/s_key_images_default_image_4.jpg website.s_kickoff_default_image @@ -406,5 +406,10 @@ Check in primary_variables.scss and theme.scss --> website.s_empowerment_default_image /theme_loftspace/static/src/img/snippets/s_empowerment_default_image.jpg + + website.s_cta_box_default_image + website.s_cta_box_default_image + /theme_loftspace/static/src/img/snippets/s_cta_box_default_image.jpg + diff --git a/theme_loftspace/views/new_page_template.xml b/theme_loftspace/views/new_page_template.xml index 547bb1727..d204ac08f 100644 --- a/theme_loftspace/views/new_page_template.xml +++ b/theme_loftspace/views/new_page_template.xml @@ -9,6 +9,43 @@ + + + + + + + + + +
+ + @@ -175,17 +211,6 @@ - - - - diff --git a/theme_loftspace/views/snippets/s_cta_box.xml b/theme_loftspace/views/snippets/s_cta_box.xml index bc91bd404..dbd1b0a0d 100644 --- a/theme_loftspace/views/snippets/s_cta_box.xml +++ b/theme_loftspace/views/snippets/s_cta_box.xml @@ -2,25 +2,25 @@ diff --git a/theme_loftspace/views/snippets/s_faq_collapse.xml b/theme_loftspace/views/snippets/s_faq_collapse.xml new file mode 100644 index 000000000..bc6e3118b --- /dev/null +++ b/theme_loftspace/views/snippets/s_faq_collapse.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/theme_loftspace/views/snippets/s_features.xml b/theme_loftspace/views/snippets/s_features.xml new file mode 100644 index 000000000..cd300d550 --- /dev/null +++ b/theme_loftspace/views/snippets/s_features.xml @@ -0,0 +1,69 @@ + + + + + + diff --git a/theme_loftspace/views/snippets/s_key_images.xml b/theme_loftspace/views/snippets/s_key_images.xml index d1af6a324..0b77784bb 100644 --- a/theme_loftspace/views/snippets/s_key_images.xml +++ b/theme_loftspace/views/snippets/s_key_images.xml @@ -2,29 +2,63 @@ diff --git a/theme_loftspace/views/snippets/s_numbers.xml b/theme_loftspace/views/snippets/s_numbers.xml index 0f7ca3927..da757f912 100644 --- a/theme_loftspace/views/snippets/s_numbers.xml +++ b/theme_loftspace/views/snippets/s_numbers.xml @@ -4,7 +4,7 @@