Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme update 2412 #4

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Theme update 2412 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2171a81
Update and optimise theme code
thetwopct Dec 29, 2024
e0d1830
Update VS Code settings
thetwopct Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .theme-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Added because we only use EN language.
MatchingTranslations:
enabled: false
TemplateLength:
# Added this to ignore our old variable naming scheme.
VariableName:
enabled: false
# Added this to ignore multiple errors from Locksmith
UnusedAssign:
enabled: false
33 changes: 22 additions & 11 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,26 @@
"**/node_modules": true,
"**/vendor": true
},
"editor.suggest.showSnippets": true,
"editor.quickSuggestions": {
"strings": true
},
"editor.wordWrap": "off",
"editor.renderFinalNewline": true,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": false,
"html.format.wrapLineLength": 80,
"editor.tabSize": 4,
"editor.insertSpaces": true,
"editor.suggest.showSnippets": true,
"editor.quickSuggestions": {
"strings": true
},
"editor.wordWrap": "off",
"editor.renderFinalNewline": "on",
"files.insertFinalNewline": true,
"files.trimFinalNewlines": false,
"html.format.wrapLineLength": 80,
"editor.tabSize": 4,
"editor.insertSpaces": true,
"[javascript]": {
"editor.formatOnSave": true
},
"[css]": {
"editor.formatOnSave": true
},
"[liquid]": {
"editor.defaultFormatter": "Shopify.theme-check-vscode",
"editor.formatOnSave": true
},
"themeCheck.checkOnSave": true
}
4 changes: 2 additions & 2 deletions layout/password.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@
{% endstyle %}

{%- unless settings.type_body_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_body_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}
{%- unless settings.type_header_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_header_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}

{{ 'section-password.css' | asset_url | stylesheet_tag }}
Expand Down
35 changes: 15 additions & 20 deletions layout/theme.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{%- comment %}<locksmith:aab6>{% endcomment -%}
{%- include 'locksmith' -%}
{%- render 'locksmith' -%}
{%- comment %}</locksmith:aab6>{% endcomment -%}

<!doctype html>
<html class="no-js" lang="{{ request.locale.iso_code }}">
<head>
{{ locksmith_initializations }}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<link rel="preconnect" href="https://cdn.shopify.com" crossorigin>
<link rel="preconnect" href="https://www.googletagmanager.com/" crossorigin="anonymous">
<link rel="preconnect" href="https://cmp.osano.com/" crossorigin="anonymous">
{%- unless settings.type_header_font.system? and settings.type_body_font.system? -%}
<link rel="preconnect" href="https://fonts.shopifycdn.com" crossorigin>
{%- endunless -%}

{{ locksmith_initializations }}

{%- unless settings.type_body_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_body_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}

{%- unless settings.type_header_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_header_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}

<link rel="dns-prefetch" href="https://www.googletagmanager.com/" >
<link rel="dns-prefetch" href="https://cmp.osano.com/" >


<title>
{{ page_title }}
{%- if current_tags %}
Expand Down Expand Up @@ -334,8 +334,8 @@

{{ 'zify-sizechart.css' | asset_url | stylesheet_tag }}

<script src="https://cmp.osano.com/16A0DbT9yDNIaQkvZ/c3494b1e-ff3a-436f-978d-842e9a0bed27/osano.js"></script>

<script src="https://cmp.osano.com/16A0DbT9yDNIaQkvZ/c3494b1e-ff3a-436f-978d-842e9a0bed27/osano.js" defer></script>
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
Expand All @@ -356,15 +356,9 @@
</script>

<script src="{{ 'global.js' | asset_url }}" defer="defer"></script>



<!-- Avada Email Marketing Script -->
{% include 'avada-em-setting' %}
<!-- /Avada Email Marketing Script -->

{{ content_for_header }}


{% render 'avada-em-setting' %}

<script>
document.documentElement.className = document.documentElement.className.replace('no-js', 'js');
if (Shopify.designMode) {
Expand All @@ -385,6 +379,7 @@

<link rel="canonical" href="{{ canonical_url }}">
{% render 'meta-tags' %}
{{ content_for_header }}
</head>

<body class="gradient">
Expand Down Expand Up @@ -448,6 +443,6 @@
{%- if settings.predictive_search_enabled -%}
<script src="{{ 'predictive-search.js' | asset_url }}" defer="defer"></script>
{%- endif -%}
<script src='{{ 'zify-sizechart.js' | asset_url }}' defer='defer'></script>
<script src='{{ 'zify-sizechart.js' | asset_url }}' defer='defer'></script>
</body>
</html>
2 changes: 1 addition & 1 deletion sections/collection-list.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"name": "t:sections.collection-list.name",
"tag": "section",
"class": "section section-collection-list",
"max_blocks": 100,
"max_blocks": 50,
"settings": [
{
"type": "text",
Expand Down
3 changes: 0 additions & 3 deletions sections/email-signup-banner.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,6 @@
}
]
}
],
"templates": [
"password"
]
}
{% endschema %}
2 changes: 1 addition & 1 deletion sections/main-product.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2322,7 +2322,7 @@
vendor: {{ product.vendor|json }},
productType: {{ product.type|json }},
collections: {{ product.collections|map:'title'|json }},
image: "https:{{ product.featured_image.src|img_url:'grande' }}",
image: "https:{{ product.featured_image | image_url: size: 'grande' }}",
url: "{{ shop.secure_url }}{{ product.url }}",
price: {{ product.price |json }},
tags: {{ product.tags |json }},
Expand Down
6 changes: 3 additions & 3 deletions snippets/avada-em-setting.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% include 'avada-em-status' %}
{% include 'avada-em-popup-cache' %}
{% render 'avada-em-status' %}
{% render 'avada-em-popup-cache' %}
{% assign scripttags = content_for_header | split: 'var urls = ["' %}
{% if scripttags.size > 1 %}
{% assign scripttags = scripttags[1] %}
Expand Down Expand Up @@ -49,4 +49,4 @@
firstName: "{{ customer.first_name }}",
lastName: "{{ customer.last_name }}",
}
</script>{% endif %}
</script>{% endif %}
6 changes: 3 additions & 3 deletions snippets/locksmith.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Last updated: Fri, 20 Sep 2024 08:59:06 -0400 (EDT)
{% endcomment -%}

{%include 'locksmith-variables', locksmith_scope: nil%}{%if locksmith_access_denied_content == blank%}{%capture locksmith_access_denied_content%}{%if locksmith_manual_lock%}{{content_for_layout}}{%elsif locksmith_remote_lock%}<div id="locksmith-content">
{% render 'locksmith-variables', locksmith_scope: nil%}{%if locksmith_access_denied_content == blank%}{%capture locksmith_access_denied_content%}{%if locksmith_manual_lock%}{{content_for_layout}}{%elsif locksmith_remote_lock%}<div id="locksmith-content">
<div id="locksmith-spinner-wrapper" style="background:#FFF;z-index:999999;top:0;left:0;right:0;bottom:0;position:fixed">
<style>
@keyframes spin { from { transform: rotate(0deg) } to { transform: rotate(360deg) } }
Expand Down Expand Up @@ -69,7 +69,7 @@
} else {
window.addEventListener('load', load);
}
</script>{%endif%}{%endcapture%}{%endif%}{%include 'locksmith-content-variables'%}{%include 'locksmith-variables', locksmith_scope: nil%}{%if locksmith_access_denied%}{%capture content_for_header%}{{content_for_header|replace:'.oembed', ''|replace:'.atom', ''|replace:'link rel="alternate" type="application/json+oembed"', 'link'|replace:' title="Feed" rel="alternate" type="application/atom+xml"', ''}}{%endcapture%}{%endif%}{%capture locksmith_initializations%}{%if locksmith_access_denied and locksmith_manual_lock == false and locksmith_noindex%}<meta name="robots" content="noindex" />{%endif%}{{locksmith_json}}{{locksmith_client}}
</script>{%endif%}{%endcapture%}{%endif%}{% render 'locksmith-content-variables'%}{% render 'locksmith-variables', locksmith_scope: nil%}{%if locksmith_access_denied%}{%capture content_for_header%}{{content_for_header|replace:'.oembed', ''|replace:'.atom', ''|replace:'link rel="alternate" type="application/json+oembed"', 'link'|replace:' title="Feed" rel="alternate" type="application/atom+xml"', ''}}{%endcapture%}{%endif%}{%capture locksmith_initializations%}{%if locksmith_access_denied and locksmith_manual_lock == false and locksmith_noindex%}<meta name="robots" content="noindex" />{%endif%}{{locksmith_json}}{{locksmith_client}}

<script data-locksmith>Locksmith.jsonTag={{locksmith_json|json}};Locksmith.jsonTagSignature={{locksmith_json_signature|json}}</script>{%endcapture%}{%if locksmith_access_granted or locksmith_manual_lock%}{%if locksmith_redirect != blank%}{%assign content_for_layout=locksmith_redirect%}{%endif%}{%else%}{%assign content_for_layout=locksmith_access_denied_content%}{%endif%}{%capture _3%}<script data-locksmith>
var load = function () {
Expand Down Expand Up @@ -106,4 +106,4 @@
} else {
window.addEventListener('load', load);
}
</script>{%endcapture%}{%unless request.design_mode or request.host contains ".shopifypreview.com" or request.page_type == "password"%}{%assign content_for_layout=content_for_layout|append:_3%}{%endunless%}{%if locksmith_access_denied and content_for_layout contains '<input type="hidden" name="form_type" value="customer_login" />'%}{%assign locksmith_original_template=template%}{%assign template='customers/login'%}{%endif%}
</script>{%endcapture%}{%unless request.design_mode or request.host contains ".shopifypreview.com" or request.page_type == "password"%}{%assign content_for_layout=content_for_layout|append:_3%}{%endunless%}{%if locksmith_access_denied and content_for_layout contains '<input type="hidden" name="form_type" value="customer_login" />'%}{%assign locksmith_original_template=template%}{%assign template='customers/login'%}{%endif%}
4 changes: 2 additions & 2 deletions templates/gift_card.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
{% endstyle %}

{%- unless settings.type_body_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_body_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}
{%- unless settings.type_header_font.system? -%}
<link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
{{ settings.type_header_font | font_url | preload_tag: as: 'font', type: 'font/woff2', crossorigin: 'anonymous' }}
{%- endunless -%}

{{ 'template-giftcard.css' | asset_url | stylesheet_tag }}
Expand Down