Skip to content

Commit

Permalink
Sync with upstream 1 (#2)
Browse files Browse the repository at this point in the history
* Update 2 translation files (Shopify#3602)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Release 15.1.0 (Shopify#3595)

* Release notes + version bump

* Fixed arrow in announcement bar and caret in product variant dropdown

* Fixed announcement bar with multiple blocks

* Adjustment to variant picker caret

* Fixed multicolumn and mega menu

* Updated release note

* Fixed modals sticking around for Featured Product whens section is removed in the editor (Shopify#3609)

* No follow for Account Login header url (Shopify#3611)

* Update translations: merchant (Shopify#3612)

* Update 1 translation file

* Update 3 translation files

* Update 1 translation file

* Update 1 translation file

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Fix workflows

* Apply current custom theme

* Update `theme_name`

* Recent update

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

* Update from Shopify for theme dawn/main

Committed from shop: Unico & Multiplo

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Jonathan Clarkin <jclarkin@users.noreply.github.com>
Co-authored-by: shopify[bot] <79544226+shopify[bot]@users.noreply.github.com>
  • Loading branch information
5 people authored Sep 20, 2024
1 parent e81d0d7 commit 6710336
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 17 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
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 locales/de.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
}
},
"collection_cards": {
"name": "Kategoriekarten",
"name": "Kollektionskarten",
"settings": {
"style": {
"options__1": {
Expand Down
2 changes: 1 addition & 1 deletion locales/es.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "Efecto hover",
"info": "Afecta a tarjetas y botones.",
"options__3": {
"label": "3D Lift"
"label": "Elevación 3D"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locales/fr.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "Effet de survol",
"info": "Concerne les cartes et les boutons.",
"options__3": {
"label": "3D lift"
"label": "3D Levée"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locales/it.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "Effetto hover",
"info": "Riguarda schede e pulsanti.",
"options__3": {
"label": "3D lift"
"label": "3D kaldırma"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locales/ja.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "ホバー効果",
"info": "カードとボタンに影響を与えます。",
"options__3": {
"label": "3Dリフト"
"label": "3D表示"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locales/pl.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "Efekt obszaru aktywnego",
"info": "Wpływa na karty i przyciski.",
"options__3": {
"label": "Podnoszenie 3D"
"label": "Efekt uniesienia 3D"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions locales/pt-PT.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
},
"animations_hover_elements": {
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Elevação vertical"
Expand Down Expand Up @@ -432,7 +432,7 @@
"content": "Animações",
"image_behavior": {
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Movimento de ambiente"
Expand Down Expand Up @@ -984,7 +984,7 @@
"sticky_header_type": {
"label": "Cabeçalho fixo",
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Ao rodar a roda do rato"
Expand Down Expand Up @@ -1564,7 +1564,7 @@
"label": "Adição rápida",
"info": "A opção Em massa é otimizada para itens comprados em maiores quantidades.",
"options": {
"option_1": "Nenhum",
"option_1": "Nenhum(a)",
"option_2": "Padrão",
"option_3": "Em massa"
}
Expand Down Expand Up @@ -1692,7 +1692,7 @@
"label": "Quadrado"
},
"options__3": {
"label": "Nenhum"
"label": "Nenhum(a)"
}
}
}
Expand Down Expand Up @@ -1741,7 +1741,7 @@
"icon": {
"label": "Ícone",
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Maçã"
Expand Down Expand Up @@ -2241,7 +2241,7 @@
"background_style": {
"label": "Fundo secundário",
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Mostrar como fundo da coluna"
Expand Down Expand Up @@ -2575,7 +2575,7 @@
"label": "Quadrado"
},
"options__3": {
"label": "Nenhum"
"label": "Nenhum(a)"
}
}
}
Expand Down Expand Up @@ -3040,7 +3040,7 @@
"icon": {
"label": "Ícone",
"options__1": {
"label": "Nenhum"
"label": "Nenhum(a)"
},
"options__2": {
"label": "Maçã"
Expand Down
2 changes: 1 addition & 1 deletion locales/tr.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"label": "Üzerine gelme efekti",
"info": "Kartları ve düğmeleri etkiler.",
"options__3": {
"label": "3D lift"
"label": "3D kaldırma"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Dawn 15.1.0 changes the way SVGs are rendered
### Fixes and improvements
- Moves SVGs from Liquid snippets to `.svg` files in the `/assets` folder
- Uses new `inline_asset_content` Liquid filter to render SVGs
Dawn 15.0.1 introduces a few bug fixes.

### Fixes and improvements
Expand Down
6 changes: 5 additions & 1 deletion sections/header.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@
{% render 'header-search', input_id: 'Search-In-Modal' %}

{%- if shop.customer_accounts_enabled -%}
<a href="{%- if customer -%}{{ routes.account_url }}{%- else -%}{{ routes.account_login_url }}{%- endif -%}" class="header__icon header__icon--account link focus-inset{% if section.settings.menu != blank %} small-hide{% endif %}">
<a
href="{%- if customer -%}{{ routes.account_url }}{%- else -%}{{ routes.account_login_url }}{%- endif -%}"
class="header__icon header__icon--account link focus-inset{% if section.settings.menu != blank %} small-hide{% endif %}"
rel="nofollow"
>
{%- if section.settings.enable_customer_avatar -%}
<account-icon>
{%- if customer and customer.has_avatar? -%}
Expand Down
1 change: 1 addition & 0 deletions snippets/header-drawer.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
<a
href="{%- if customer -%}{{ routes.account_url }}{%- else -%}{{ routes.account_login_url }}{%- endif -%}"
class="menu-drawer__account link focus-inset h5 medium-hide large-up-hide"
rel="nofollow"
>
{%- if section.settings.enable_customer_avatar -%}
<account-icon>
Expand Down

0 comments on commit 6710336

Please sign in to comment.