Skip to content

Commit

Permalink
Merge branch 'main' into growth_labs/update_account_login_link_to_be_…
Browse files Browse the repository at this point in the history
…no_follow
  • Loading branch information
jclarkin committed Sep 18, 2024
2 parents 4e9b5e7 + 259252b commit 68028b5
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 16 deletions.
1 change: 1 addition & 0 deletions assets/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ class ModalDialog extends HTMLElement {
connectedCallback() {
if (this.moved) return;
this.moved = true;
this.dataset.section = this.closest('.shopify-section').id.replace('shopify-section-', '');
document.body.appendChild(this);
}

Expand Down
4 changes: 4 additions & 0 deletions assets/section-main-product.css
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ product-info {
max-width: 100%;
}

.product-form__input .svg-wrapper {
right: 1.5rem;
}

.product-form__submit {
margin-bottom: 1rem;
}
Expand Down
6 changes: 6 additions & 0 deletions assets/theme-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ document.addEventListener('shopify:section:load', () => {
}
});

document.addEventListener('shopify:section:unload', (event) => {
document.querySelectorAll(`[data-section="${event.detail.sectionId}"]`).forEach((element) => {
element.remove();
});
});

document.addEventListener('shopify:section:reorder', () => hideProductModal());

document.addEventListener('shopify:section:select', () => hideProductModal());
Expand Down
2 changes: 1 addition & 1 deletion config/settings_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "theme_info",
"theme_name": "Dawn",
"theme_version": "15.0.1",
"theme_version": "15.1.0",
"theme_author": "Shopify",
"theme_documentation_url": "https://help.shopify.com/manual/online-store/themes",
"theme_support_url": "https://support.shopify.com/"
Expand Down
8 changes: 3 additions & 5 deletions release-notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
Dawn 15.0.1 introduces a few bug fixes.
Dawn 15.1.0 changes the way SVGs are rendered
### Fixes and improvements
- Fix issues where when the header section is hidden, some functionalities were broken.
- Update cart errors to be output as a string rather than a HTML element.
- Escape variant option names so that when an option includes quotation marks it doesn’t cause undesired effects.
- Fix placeholder product cards that were not showing a default price and make the check more robust.
- Moves SVGs from Liquid snippets to `.svg` files in the `/assets` folder
- Uses new `inline_asset_content` Liquid filter to render SVGs
8 changes: 2 additions & 6 deletions sections/announcement-bar.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
<p class="announcement-bar__message h5">
<span>{{ section.blocks.first.settings.text | escape }}</span>
{%- if section.blocks.first.settings.link != blank -%}
<span class="svg-wrapper">
{{- 'icon-arrow.svg' | inline_asset_content -}}
</span>
{{- 'icon-arrow.svg' | inline_asset_content -}}
{%- endif -%}
</p>
{%- if section.blocks.first.settings.link != blank -%}
Expand Down Expand Up @@ -106,9 +104,7 @@
<p class="announcement-bar__message h5">
<span>{{ block.settings.text | escape }}</span>
{%- if block.settings.link != blank -%}
<span class="svg-wrapper">
{{- 'icon-arrow.svg' | inline_asset_content -}}
</span>
{{- 'icon-arrow.svg' | inline_asset_content -}}
{%- endif -%}
</p>
{%- if block.settings.link != blank -%}
Expand Down
4 changes: 3 additions & 1 deletion sections/multicolumn.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@
{% endif %}
>
{{- block.settings.link_label | escape -}}
<<span class="svg-wrapper">span class="icon-wrap">&nbsp;{{ 'icon-arrow.svg' | inline_asset_content }}</span></span>
<span class="svg-wrapper"
><span class="icon-wrap">&nbsp;{{ 'icon-arrow.svg' | inline_asset_content }}</span></span
>
</a>
{%- endif -%}
</div>
Expand Down
4 changes: 1 addition & 3 deletions snippets/header-mega-menu.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
>
{{- link.title | escape -}}
</span>
<span class="svg-wrapper">
{{- 'icon-caret.svg' | inline_asset_content -}}
</span>
{{- 'icon-caret.svg' | inline_asset_content -}}
</summary>
<div
id="MegaMenu-Content-{{ forloop.index }}"
Expand Down

0 comments on commit 68028b5

Please sign in to comment.