From 15bffdad1cf374197b767eafc00fe5a2ffce0869 Mon Sep 17 00:00:00 2001 From: Gray Gilmore Date: Tue, 14 Jan 2025 10:24:57 -0800 Subject: [PATCH 1/4] Add .shopify to the .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8bfaac41362..bb675ff1dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ .Trashes ehthumbs.db Thumbs.db +.shopify From bf1eca0e258c3f0c7f558d05c3c687476216389a Mon Sep 17 00:00:00 2001 From: Gray Gilmore Date: Tue, 14 Jan 2025 10:25:10 -0800 Subject: [PATCH 2/4] Fix a theme check error for invalid HTML --- sections/header.liquid | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sections/header.liquid b/sections/header.liquid index bd2cc4cee94..89297a1bf96 100644 --- a/sections/header.liquid +++ b/sections/header.liquid @@ -106,7 +106,15 @@ endfor -%} -<{% if section.settings.sticky_header_type != 'none' %}sticky-header data-sticky-type="{{ section.settings.sticky_header_type }}"{% else %}div{% endif %} class="header-wrapper color-{{ section.settings.color_scheme }} gradient{% if section.settings.show_line_separator %} header-wrapper--border-bottom{% endif %}"> +{% liquid + assign header_tag = 'div' + + if section.settings.sticky_header_type != 'none' + assign header_tag = 'sticky-header' + endif +%} + +<{{ header_tag }} {% if header_tag == 'sticky-header' %}data-sticky-type="{{ section.settings.sticky_header_type }}"{% endif %} class="header-wrapper color-{{ section.settings.color_scheme }} gradient{% if section.settings.show_line_separator %} header-wrapper--border-bottom{% endif %}"> {%- liquid assign social_links = false assign localization_forms = false @@ -280,7 +288,7 @@ - + {%- if settings.cart_type == "notification" -%} {%- render 'cart-notification', color_scheme: section.settings.color_scheme, desktop_menu_type: section.settings.menu_type_desktop -%} From cda2244529cd0ecb2c07020ed45a1b6b9435167e Mon Sep 17 00:00:00 2001 From: Gray Gilmore Date: Tue, 14 Jan 2025 10:11:35 -0800 Subject: [PATCH 3/4] Bump theme check action to v2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1612552a734..5433c2f1d85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,6 @@ jobs: steps: - uses: actions/checkout@v3 - name: Theme Check - uses: shopify/theme-check-action@v1 + uses: shopify/theme-check-action@v2 with: token: ${{ github.token }} From ebb5ca6bedb7a5cff29b6ccc369eaba556b0f558 Mon Sep 17 00:00:00 2001 From: Gray Gilmore Date: Tue, 14 Jan 2025 11:15:40 -0800 Subject: [PATCH 4/4] Bump actions/checkout to v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5433c2f1d85..08b6552a752 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: name: Lighthouse runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Lighthouse uses: shopify/lighthouse-ci-action@v1 with: @@ -19,7 +19,7 @@ jobs: name: Theme Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Theme Check uses: shopify/theme-check-action@v2 with: