From 221d196844fea7641b5450870a07ff49bc1e11e3 Mon Sep 17 00:00:00 2001
From: Christy <75811975+cmegalo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:45:25 -0600
Subject: [PATCH 01/35] Update README.md for 15.0.1
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b427d059a6..664b09fc2b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
Brought to you and maintained by [Trellis Commerce](https://trellis.co/) - A full-service eCommerce agency based in Boston, MA
-Latest merged code from [Dawn v14.0.0](https://github.com/Shopify/dawn/releases/tag/v14.0.0)
+Latest merged code from [Dawn v15.0.1](https://github.com/Shopify/dawn/releases/tag/v15.0.1)
# Dawn + Tailwind CSS + Prettier Shopify Starter Theme
@@ -82,7 +82,7 @@ In your GitHub repo, navigate to Settings > Secrets > Actions and add the follow
These secret values are used in the `ci.yml` GitHub workflow:
-
+
## Install [Shopify Liquid VSCode extension](https://marketplace.visualstudio.com/items?itemName=Shopify.theme-check-vscode)
From ba83f8c4d0edee0aff5a05872dba696a98794541 Mon Sep 17 00:00:00 2001
From: Christy
Date: Fri, 2 Aug 2024 14:55:10 -0600
Subject: [PATCH 02/35] Updated workflow
---
.github/workflows/ci.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a11054e66a..b0b03a077d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,12 +2,12 @@ name: CI
on: [push]
jobs:
tailwindcss-update:
- name: Generate TailwindCSS
+ name: Generate Tailwind CSS
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
- - name: Generate TailwindCSS
+ uses: actions/checkout@v4
+ - name: Generate Tailwind CSS
uses: ZoeyVid/tailwindcss-update@main
with:
input: assets/app-tailwind.css
@@ -15,6 +15,7 @@ jobs:
params: ""
- name: Commit & Push
run: |
+ git add --force assets/app.css
git config user.name "GitHub"
git config user.email "noreply@github.com"
git diff-index --quiet HEAD || git commit -m "ci: tailwindcss-update"
From 17e69580f6c13f4399fe4c5158570b633de5eb2f Mon Sep 17 00:00:00 2001
From: GitHub
Date: Fri, 2 Aug 2024 20:55:36 +0000
Subject: [PATCH 03/35] ci: tailwindcss-update
---
assets/app.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/app.css b/assets/app.css
index a30f33fe89..b41cde92d8 100644
--- a/assets/app.css
+++ b/assets/app.css
@@ -1,5 +1,5 @@
/*
-! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.7 | MIT License | https://tailwindcss.com
*/
/*
From 29c92595370c4b5c998e21e7333ae8c4ec7a6583 Mon Sep 17 00:00:00 2001
From: Chelsey Riewer
Date: Wed, 7 Aug 2024 14:20:30 -0400
Subject: [PATCH 04/35] SHOPBASE-16 Add more navigation tiers, start of the
addition of the promotional section
---
sections/header.liquid | 44 +++++++++++++++++++++++++++++--
snippets/header-mega-menu.liquid | 45 ++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/sections/header.liquid b/sections/header.liquid
index 45e713fb33..ae4c2ab84b 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -181,7 +181,7 @@
if section.settings.menu_type_desktop == 'dropdown'
render 'header-dropdown-menu'
elsif section.settings.menu_type_desktop != 'drawer'
- render 'header-mega-menu'
+ render 'header-mega-menu' blocks: section.blocks
endif
endif
%}
@@ -651,7 +651,47 @@
],
"blocks": [
{
- "type": "@app"
+ "type": "@app",
+ },
+ {
+ "type": "promotional",
+ "name": "Promotional Items",
+ "settings": [
+ {
+ "type": "number",
+ "id": "promotional_index",
+ "default": 1,
+ "label": "Nav Position"
+ },
+ {
+ "type": "image_picker",
+ "id": "promotional_image",
+ "label": "Image"
+ },
+ {
+ "type": "text",
+ "id": "promotional_headline",
+ "default": "Headline",
+ "label": "Headline"
+ },
+ {
+ "type": "text",
+ "id": "promotional_description",
+ "default": "Description",
+ "label": "Description"
+ },
+ {
+ "type": "text",
+ "id": "promotional_button_text",
+ "default": "Button Text",
+ "label": "Button Text"
+ },
+ {
+ "type": "url",
+ "id": "promotional_button_url",
+ "label": "Button Url"
+ }
+ ]
}
]
}
diff --git a/snippets/header-mega-menu.liquid b/snippets/header-mega-menu.liquid
index d42b9b59d9..379e1cab65 100644
--- a/snippets/header-mega-menu.liquid
+++ b/snippets/header-mega-menu.liquid
@@ -8,6 +8,7 @@