Skip to content

Commit

Permalink
[IMP] theme_orchid: revamp theme
Browse files Browse the repository at this point in the history
task-4178087
part of task-4177975
  • Loading branch information
stefanorigano committed Sep 26, 2024
1 parent 496caf9 commit 8da8e7b
Show file tree
Hide file tree
Showing 29 changed files with 650 additions and 442 deletions.
16 changes: 9 additions & 7 deletions theme_orchid/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'category': 'Theme/Retail',
'summary': 'Florist, Gardens, Flowers, Nature, Green, Beauty, Stores',
'sequence': 230,
'version': '2.0.0',
'version': '3.0.0',
'depends': ['theme_common'],
'data': [
'data/generate_primary_template.xml',
Expand All @@ -17,21 +17,26 @@
'views/snippets/s_striped_top.xml',
'views/snippets/s_card_offset.xml',
'views/snippets/s_text_image.xml',
'views/snippets/s_title.xml',
'views/snippets/s_motto.xml',
'views/snippets/s_image_text.xml',
'views/snippets/s_image_punchy.xml',
'views/snippets/s_image_title.xml',
'views/snippets/s_images_wall.xml',
'views/snippets/s_images_mosaic.xml',
'views/snippets/s_three_columns.xml',
'views/snippets/s_image_text_overlap.xml',
'views/snippets/s_quotes_carousel.xml',
'views/snippets/s_carousel_intro.xml',
'views/snippets/s_quotes_carousel_minimal.xml',
'views/snippets/s_features_wall.xml',
'views/snippets/s_call_to_action.xml',
'views/snippets/s_freegrid.xml',
'views/snippets/s_company_team_shapes.xml',
'views/snippets/s_company_team_basic.xml',
'views/snippets/s_numbers.xml',
'views/snippets/s_pricelist_boxed.xml',
'views/snippets/s_process_steps.xml',
'views/snippets/s_media_list.xml',
'views/snippets/s_framed_intro.xml',
'views/snippets/s_product_catalog.xml',
Expand All @@ -42,10 +47,12 @@
'views/snippets/s_image_hexagonal.xml',
'views/snippets/s_striped_center_top.xml',
'views/snippets/s_key_images.xml',
'views/snippets/s_kickoff.xml',
'views/snippets/s_intro_pill.xml',
'views/snippets/s_big_number.xml',
'views/snippets/s_wavy_grid.xml',
'views/snippets/s_shape_image.xml',
'views/snippets/s_references.xml',
'views/snippets/s_empowerment.xml',
'views/new_page_template.xml',
],
Expand All @@ -55,14 +62,9 @@
],
'images_preview_theme': {
'website.s_cover_default_image': '/theme_orchid/static/src/img/snippets/s_parallax.jpg',
'website.s_image_text_default_image': '/theme_orchid/static/src/img/snippets/s_carousel_2.jpg',
'website.s_text_image_default_image': '/theme_orchid/static/src/img/snippets/s_media_list_3.jpg',
'website.s_three_columns_default_image_1': '/theme_orchid/static/src/img/snippets/library_image_11.jpg',
'website.s_three_columns_default_image_2': '/theme_orchid/static/src/img/snippets/library_image_13.jpg',
'website.s_three_columns_default_image_3': '/theme_orchid/static/src/img/snippets/library_image_07.jpg',
},
'configurator_snippets': {
'homepage': ['s_cover', 's_image_text', 's_text_image', 's_three_columns', 's_quotes_carousel', 's_call_to_action'],
'homepage': ['s_kickoff', 's_key_images', 's_process_steps', 's_freegrid', 's_image_text_overlap', 's_company_team_basic', 's_title', 's_images_wall', 's_references'],
},
'new_page_templates': {
'about': {
Expand Down
Binary file modified theme_orchid/static/description/orchid_screenshot.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
531 changes: 278 additions & 253 deletions theme_orchid/static/description/theme_orchid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_carousel_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_kickoff_default_image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_product_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_product_4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_product_5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme_orchid/static/src/img/snippets/s_product_6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 34 additions & 20 deletions theme_orchid/static/src/js/tour.js
Original file line number Diff line number Diff line change
@@ -1,53 +1,67 @@
/** @odoo-module */

import * as wTourUtils from '@website/js/tours/tour_utils';
import { _t } from "@web/core/l10n/translation";


const snippets = [
{
id: 's_cover',
name: 'Cover',
id: 's_kickoff',
name: 'Kickoff',
groupName: "Intro",
},
{
id: 's_image_text',
name: 'Image - Text',
groupName: "Content",
id: 's_key_images',
name: 'Key Images',
groupName: "Columns",
},
{
id: 's_text_image',
name: 'Text - Image',
id: 's_process_steps',
name: 'Steps',
groupName: "Content",
},
{
id: 's_three_columns',
name: 'Columns',
id: 's_freegrid',
name: 'Free grid',
groupName: "Columns",
},
{
id: 's_quotes_carousel',
name: 'Quotes',
id: 's_image_text_overlap',
name: 'Image - Text Overlap',
groupName: "Content",
},
{
id: 's_company_team_basic',
name: 'Team Basic',
groupName: "People",
},
{
id: 's_call_to_action',
name: 'Call to Action',
groupName: "Content",
id: 's_title',
name: 'Title',
groupName: "Text",
},
{
id: 's_images_wall',
name: 'Images Wall',
groupName: "Images",
},
{
id: 's_references',
name: 'References',
groupName: "People",
},
];

wTourUtils.registerThemeHomepageTour("orchid_tour", () => [
wTourUtils.assertCssVariable('--color-palettes-name', '"orchid-7"'),
wTourUtils.assertCssVariable('--color-palettes-name', '"default-light-9"'),
...wTourUtils.dragNDrop(snippets[0]),
...wTourUtils.clickOnText(snippets[0], 'h1'),
wTourUtils.goBackToBlocks(),
...wTourUtils.dragNDrop(snippets[1]),
...wTourUtils.dragNDrop(snippets[2]),
...wTourUtils.dragNDrop(snippets[3]),
...wTourUtils.clickOnSnippet(snippets[3]),
wTourUtils.changeOption('ContainerWidth', 'we-button-group.o_we_user_value_widget', _t('width')),
wTourUtils.goBackToBlocks(),
...wTourUtils.dragNDrop(snippets[4]),
...wTourUtils.dragNDrop(snippets[5]),
...wTourUtils.clickOnText(snippets[5], 'h3'),
...wTourUtils.dragNDrop(snippets[6]),
...wTourUtils.dragNDrop(snippets[7]),
...wTourUtils.dragNDrop(snippets[8]),
]);
4 changes: 2 additions & 2 deletions theme_orchid/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Headings font weight
// Handles Bootstrap Customizations


$headings-font-weight: $o-theme-headings-font-weight !default;
25 changes: 13 additions & 12 deletions theme_orchid/static/src/scss/primary_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
// Fonts
//------------------------------------------------------------------------------

$o-theme-h1-font-size-multiplier: (62 / 16);
$o-theme-h2-font-size-multiplier: (48 / 16);
$o-theme-h3-font-size-multiplier: (36 / 16);
$o-theme-h5-font-size-multiplier: (21 / 16);
$o-theme-h6-font-size-multiplier: (18 / 16);

$o-theme-headings-font-weight: 600;

$o-theme-font-configs: (
'Heebo': (
'family': ('Heebo', sans-serif),
Expand Down Expand Up @@ -51,6 +43,14 @@ $o-theme-font-configs: (
'family': ('Cormorant Garamond', serif),
'url': 'Cormorant+Garamond:300,300i,400,400i,700,700i',
),
'Elsie': (
'family': ('Elsie', serif),
'url': 'Elsie:400,900',
),
'DM Sans': (
'family': ('DM Sans', serif),
'url': 'DM+Sans:300,300i,400,400i,700,700i',
),
);

//------------------------------------------------------------------------------
Expand All @@ -59,14 +59,15 @@ $o-theme-font-configs: (

$o-website-values-palettes: (
(
'color-palettes-name': 'orchid-7',
'font': 'Questrial',
'headings-font': 'Cormorant Garamond',
'color-palettes-name': 'default-light-9',
'font': 'DM Sans',
'headings-font': 'Elsie',
'header-template': 'sales_four',
'footer-template': 'descriptive',
),
);

$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'orchid-7');
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-light-9');

$o-color-palettes-compatibility-indexes: (
1: 'orchid-1',
Expand Down
42 changes: 42 additions & 0 deletions theme_orchid/views/snippets/s_company_team_basic.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<template id="s_company_team_basic" inherit_id="website.s_company_team_basic">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" separator=" "/>
</xpath>
<xpath expr="//h3" position="replace">
<h2 style="text-align: center">Meet the Team</h2>
</xpath>

<!-- Person 1 -->
<xpath expr="//h4" position="replace" mode="inner">
Tony Fred, Floral Director
</xpath>
<xpath expr="//p[2]" position="replace" mode="inner">
Tony leads the creative vision for the shop.
</xpath>
<!-- Person 2 -->
<xpath expr="//div[3]//h4" position="replace" mode="inner">
Mich Stark, Operations Manager
</xpath>
<xpath expr="//div[3]//p[2]" position="replace" mode="inner">
Mich makes sure everything runs smoothly.
</xpath>
<!-- Person 3 -->
<xpath expr="//div[4]//h4" position="replace" mode="inner">
Aline Turner, Bouquet Designer
</xpath>
<xpath expr="//div[4]//p[2]" position="replace" mode="inner">
Aline is the mastermind behind our bespoke floral arrangements.
</xpath>
<!-- Person 4 -->
<xpath expr="//div[5]//h4" position="replace" mode="inner">
Iris Joe, Customer Relations
</xpath>
<xpath expr="//div[5]//p[2]" position="replace" mode="inner">
Iris ensures that each customer has a delightful experience.
</xpath>
</template>

</odoo>
11 changes: 0 additions & 11 deletions theme_orchid/views/snippets/s_cover.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,4 @@
<xpath expr="//p" position="replace"/>
</template>

<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/01_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_01_001"/>
</xpath>
</template>

</odoo>
25 changes: 24 additions & 1 deletion theme_orchid/views/snippets/s_framed_intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,32 @@
<odoo>

<template id="s_framed_intro" inherit_id="website.s_framed_intro">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/03','showOnMobile':true}</attribute>
<attribute name="class" add="o_cc5" remove="" separator=" "/>
</xpath>
<!-- Section Shape -->
<xpath expr="//section//div" position="before">
<div class="o_we_shape o_web_editor_Blobs_03 o_shape_show_mobile"/>
</xpath>
<!-- Subtitle -->
<xpath expr="//h1" position="before">
<p class="lead">Bloom with Joy:</p>
</xpath>
<!-- Title -->
<xpath expr="//h1" position="replace" mode="inner">
Blossoms for Every Moment: Fresh, Vibrant, and Beautiful
Fresh Flowers Delivered to Your Doorstep! Hello
</xpath>
<xpath expr="//h1" position="attributes">
<attribute name="class" add="display-2" remove="display-4" separator=" "/>
</xpath>
<!-- CTA -->
<xpath expr="//a" position="before">
<a href="#" class="btn btn-lg btn-secondary">See the Full Bloom</a>
</xpath>
<xpath expr="//a" position="replace" mode="inner">
About Us
</xpath>
<!-- Image -->
<xpath expr="//img" position="attributes">
Expand Down
11 changes: 11 additions & 0 deletions theme_orchid/views/snippets/s_freegrid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,15 @@
</xpath>
</template>

<template id="configurator_s_freegrid" inherit_id="website.configurator_s_freegrid">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/03','flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
<attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
</xpath>
<!-- Section Shape -->
<xpath expr="//section//div" position="before">
<div class="o_we_shape o_web_editor_Blobs_03" style="background-image: url('/web_editor/shape/web_editor%2FBlobs%2F03.svg?c2=%23EFCCBF&amp;flip=x'); background-position: 50% 0%;"/>
</xpath>
</template>
</odoo>
11 changes: 0 additions & 11 deletions theme_orchid/views/snippets/s_image_text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,4 @@
</xpath>
</template>

<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>

</odoo>
59 changes: 59 additions & 0 deletions theme_orchid/views/snippets/s_image_text_overlap.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<template id="s_image_text_overlap" inherit_id="website.s_image_text_overlap">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc2 pb104" remove="pb80" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
The Orchid Concept
</xpath>
<!-- Paragraphs -->
<xpath expr="//p" position="replace" mode="inner">
<br/>
</xpath>
<xpath expr="//p[2]" position="replace" mode="inner">
From your local producer to your door, discover how we deliver our multiple sorts of flowers and bring you happiness.
</xpath>
</template>

<template id="configurator_s_image_text_overlap" inherit_id="website.configurator_s_image_text_overlap">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/19','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
<attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
</xpath>

<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_19"/>
</xpath>

<xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
<attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
</xpath>

<xpath expr="//img" position="attributes">
<attribute name="src">/theme_orchid/static/src/img/snippets/configurator_s_image_text_overlap.jpg</attribute>
<attribute name="class" add="img-thumbnail" separator=" "/>
<attribute name="style" add="padding: 16px" separator="; "/>
</xpath>

<xpath expr="//h2" position="before">
<p class="lead">Global 24-Hour Flower Delivery</p>
</xpath>

<xpath expr="//h2" position="replace" mode="inner">
Brighten any corner of the globe with our express 24-hour worldwide flower delivery service.
</xpath>

<xpath expr="//h2" position="attributes">
<attribute name="class" add="h3-fs" separator=" "/>
</xpath>

<xpath expr="//p[2]" position="replace"/>
<xpath expr="//p[2]" position="replace"/>
<xpath expr="//p[2]" position="replace"/>
</template>

</odoo>
Loading

0 comments on commit 8da8e7b

Please sign in to comment.