From 187ce2bc84f9e3de0359ad362fd7b04b6728ca86 Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 16:58:37 +0100
Subject: [PATCH 1/6] Move SCSS files to /assets/scss folder

---
 src/{styles => assets/scss}/base/_auto-grid.scss                  | 0
 src/{styles => assets/scss}/base/_border.scss                     | 0
 src/{styles => assets/scss}/base/_breakpoint.scss                 | 0
 src/{styles => assets/scss}/base/_color.scss                      | 0
 src/{styles => assets/scss}/base/_elevation.scss                  | 0
 src/{styles => assets/scss}/base/_font.scss                       | 0
 src/{styles => assets/scss}/base/_grid.scss                       | 0
 src/{styles => assets/scss}/base/_list.scss                       | 0
 src/{styles => assets/scss}/base/_outline.scss                    | 0
 src/{styles => assets/scss}/base/_reset.scss                      | 0
 src/{styles => assets/scss}/base/_root.scss                       | 0
 src/{styles => assets/scss}/base/_size.scss                       | 0
 src/{styles => assets/scss}/base/_space.scss                      | 0
 src/{styles => assets/scss}/base/_utility.scss                    | 0
 src/{styles => assets/scss}/base/keyframes/_blink.scss            | 0
 src/{styles => assets/scss}/base/keyframes/_fade-in.scss          | 0
 src/{styles => assets/scss}/base/keyframes/_pop-up.scss           | 0
 src/{styles => assets/scss}/base/keyframes/_spin.scss             | 0
 src/{styles => assets/scss}/base/utilities/_align-center.scss     | 0
 src/{styles => assets/scss}/base/utilities/_align-horizontal.scss | 0
 src/{styles => assets/scss}/base/utilities/_align-vertical.scss   | 0
 src/{styles => assets/scss}/base/utilities/_animations.scss       | 0
 src/{styles => assets/scss}/base/utilities/_border-radius.scss    | 0
 src/{styles => assets/scss}/base/utilities/_colors.scss           | 0
 src/{styles => assets/scss}/base/utilities/_contents.scss         | 0
 src/{styles => assets/scss}/base/utilities/_elevations.scss       | 0
 src/{styles => assets/scss}/base/utilities/_gutter-gap.scss       | 0
 src/{styles => assets/scss}/base/utilities/_height-width.scss     | 0
 src/{styles => assets/scss}/base/utilities/_margins.scss          | 0
 src/{styles => assets/scss}/base/utilities/_paddings.scss         | 0
 src/{styles => assets/scss}/base/utilities/_size-content.scss     | 0
 src/{styles => assets/scss}/base/utilities/_sizing.scss           | 0
 src/{styles => assets/scss}/base/utilities/_space-content.scss    | 0
 src/{styles => assets/scss}/base/utilities/_spacings.scss         | 0
 src/{styles => assets/scss}/base/utilities/_sr-only.scss          | 0
 src/{styles => assets/scss}/base/utilities/_top-bottom.scss       | 0
 src/{styles => assets/scss}/globals.scss                          | 0
 37 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{styles => assets/scss}/base/_auto-grid.scss (100%)
 rename src/{styles => assets/scss}/base/_border.scss (100%)
 rename src/{styles => assets/scss}/base/_breakpoint.scss (100%)
 rename src/{styles => assets/scss}/base/_color.scss (100%)
 rename src/{styles => assets/scss}/base/_elevation.scss (100%)
 rename src/{styles => assets/scss}/base/_font.scss (100%)
 rename src/{styles => assets/scss}/base/_grid.scss (100%)
 rename src/{styles => assets/scss}/base/_list.scss (100%)
 rename src/{styles => assets/scss}/base/_outline.scss (100%)
 rename src/{styles => assets/scss}/base/_reset.scss (100%)
 rename src/{styles => assets/scss}/base/_root.scss (100%)
 rename src/{styles => assets/scss}/base/_size.scss (100%)
 rename src/{styles => assets/scss}/base/_space.scss (100%)
 rename src/{styles => assets/scss}/base/_utility.scss (100%)
 rename src/{styles => assets/scss}/base/keyframes/_blink.scss (100%)
 rename src/{styles => assets/scss}/base/keyframes/_fade-in.scss (100%)
 rename src/{styles => assets/scss}/base/keyframes/_pop-up.scss (100%)
 rename src/{styles => assets/scss}/base/keyframes/_spin.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_align-center.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_align-horizontal.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_align-vertical.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_animations.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_border-radius.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_colors.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_contents.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_elevations.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_gutter-gap.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_height-width.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_margins.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_paddings.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_size-content.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_sizing.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_space-content.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_spacings.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_sr-only.scss (100%)
 rename src/{styles => assets/scss}/base/utilities/_top-bottom.scss (100%)
 rename src/{styles => assets/scss}/globals.scss (100%)

diff --git a/src/styles/base/_auto-grid.scss b/src/assets/scss/base/_auto-grid.scss
similarity index 100%
rename from src/styles/base/_auto-grid.scss
rename to src/assets/scss/base/_auto-grid.scss
diff --git a/src/styles/base/_border.scss b/src/assets/scss/base/_border.scss
similarity index 100%
rename from src/styles/base/_border.scss
rename to src/assets/scss/base/_border.scss
diff --git a/src/styles/base/_breakpoint.scss b/src/assets/scss/base/_breakpoint.scss
similarity index 100%
rename from src/styles/base/_breakpoint.scss
rename to src/assets/scss/base/_breakpoint.scss
diff --git a/src/styles/base/_color.scss b/src/assets/scss/base/_color.scss
similarity index 100%
rename from src/styles/base/_color.scss
rename to src/assets/scss/base/_color.scss
diff --git a/src/styles/base/_elevation.scss b/src/assets/scss/base/_elevation.scss
similarity index 100%
rename from src/styles/base/_elevation.scss
rename to src/assets/scss/base/_elevation.scss
diff --git a/src/styles/base/_font.scss b/src/assets/scss/base/_font.scss
similarity index 100%
rename from src/styles/base/_font.scss
rename to src/assets/scss/base/_font.scss
diff --git a/src/styles/base/_grid.scss b/src/assets/scss/base/_grid.scss
similarity index 100%
rename from src/styles/base/_grid.scss
rename to src/assets/scss/base/_grid.scss
diff --git a/src/styles/base/_list.scss b/src/assets/scss/base/_list.scss
similarity index 100%
rename from src/styles/base/_list.scss
rename to src/assets/scss/base/_list.scss
diff --git a/src/styles/base/_outline.scss b/src/assets/scss/base/_outline.scss
similarity index 100%
rename from src/styles/base/_outline.scss
rename to src/assets/scss/base/_outline.scss
diff --git a/src/styles/base/_reset.scss b/src/assets/scss/base/_reset.scss
similarity index 100%
rename from src/styles/base/_reset.scss
rename to src/assets/scss/base/_reset.scss
diff --git a/src/styles/base/_root.scss b/src/assets/scss/base/_root.scss
similarity index 100%
rename from src/styles/base/_root.scss
rename to src/assets/scss/base/_root.scss
diff --git a/src/styles/base/_size.scss b/src/assets/scss/base/_size.scss
similarity index 100%
rename from src/styles/base/_size.scss
rename to src/assets/scss/base/_size.scss
diff --git a/src/styles/base/_space.scss b/src/assets/scss/base/_space.scss
similarity index 100%
rename from src/styles/base/_space.scss
rename to src/assets/scss/base/_space.scss
diff --git a/src/styles/base/_utility.scss b/src/assets/scss/base/_utility.scss
similarity index 100%
rename from src/styles/base/_utility.scss
rename to src/assets/scss/base/_utility.scss
diff --git a/src/styles/base/keyframes/_blink.scss b/src/assets/scss/base/keyframes/_blink.scss
similarity index 100%
rename from src/styles/base/keyframes/_blink.scss
rename to src/assets/scss/base/keyframes/_blink.scss
diff --git a/src/styles/base/keyframes/_fade-in.scss b/src/assets/scss/base/keyframes/_fade-in.scss
similarity index 100%
rename from src/styles/base/keyframes/_fade-in.scss
rename to src/assets/scss/base/keyframes/_fade-in.scss
diff --git a/src/styles/base/keyframes/_pop-up.scss b/src/assets/scss/base/keyframes/_pop-up.scss
similarity index 100%
rename from src/styles/base/keyframes/_pop-up.scss
rename to src/assets/scss/base/keyframes/_pop-up.scss
diff --git a/src/styles/base/keyframes/_spin.scss b/src/assets/scss/base/keyframes/_spin.scss
similarity index 100%
rename from src/styles/base/keyframes/_spin.scss
rename to src/assets/scss/base/keyframes/_spin.scss
diff --git a/src/styles/base/utilities/_align-center.scss b/src/assets/scss/base/utilities/_align-center.scss
similarity index 100%
rename from src/styles/base/utilities/_align-center.scss
rename to src/assets/scss/base/utilities/_align-center.scss
diff --git a/src/styles/base/utilities/_align-horizontal.scss b/src/assets/scss/base/utilities/_align-horizontal.scss
similarity index 100%
rename from src/styles/base/utilities/_align-horizontal.scss
rename to src/assets/scss/base/utilities/_align-horizontal.scss
diff --git a/src/styles/base/utilities/_align-vertical.scss b/src/assets/scss/base/utilities/_align-vertical.scss
similarity index 100%
rename from src/styles/base/utilities/_align-vertical.scss
rename to src/assets/scss/base/utilities/_align-vertical.scss
diff --git a/src/styles/base/utilities/_animations.scss b/src/assets/scss/base/utilities/_animations.scss
similarity index 100%
rename from src/styles/base/utilities/_animations.scss
rename to src/assets/scss/base/utilities/_animations.scss
diff --git a/src/styles/base/utilities/_border-radius.scss b/src/assets/scss/base/utilities/_border-radius.scss
similarity index 100%
rename from src/styles/base/utilities/_border-radius.scss
rename to src/assets/scss/base/utilities/_border-radius.scss
diff --git a/src/styles/base/utilities/_colors.scss b/src/assets/scss/base/utilities/_colors.scss
similarity index 100%
rename from src/styles/base/utilities/_colors.scss
rename to src/assets/scss/base/utilities/_colors.scss
diff --git a/src/styles/base/utilities/_contents.scss b/src/assets/scss/base/utilities/_contents.scss
similarity index 100%
rename from src/styles/base/utilities/_contents.scss
rename to src/assets/scss/base/utilities/_contents.scss
diff --git a/src/styles/base/utilities/_elevations.scss b/src/assets/scss/base/utilities/_elevations.scss
similarity index 100%
rename from src/styles/base/utilities/_elevations.scss
rename to src/assets/scss/base/utilities/_elevations.scss
diff --git a/src/styles/base/utilities/_gutter-gap.scss b/src/assets/scss/base/utilities/_gutter-gap.scss
similarity index 100%
rename from src/styles/base/utilities/_gutter-gap.scss
rename to src/assets/scss/base/utilities/_gutter-gap.scss
diff --git a/src/styles/base/utilities/_height-width.scss b/src/assets/scss/base/utilities/_height-width.scss
similarity index 100%
rename from src/styles/base/utilities/_height-width.scss
rename to src/assets/scss/base/utilities/_height-width.scss
diff --git a/src/styles/base/utilities/_margins.scss b/src/assets/scss/base/utilities/_margins.scss
similarity index 100%
rename from src/styles/base/utilities/_margins.scss
rename to src/assets/scss/base/utilities/_margins.scss
diff --git a/src/styles/base/utilities/_paddings.scss b/src/assets/scss/base/utilities/_paddings.scss
similarity index 100%
rename from src/styles/base/utilities/_paddings.scss
rename to src/assets/scss/base/utilities/_paddings.scss
diff --git a/src/styles/base/utilities/_size-content.scss b/src/assets/scss/base/utilities/_size-content.scss
similarity index 100%
rename from src/styles/base/utilities/_size-content.scss
rename to src/assets/scss/base/utilities/_size-content.scss
diff --git a/src/styles/base/utilities/_sizing.scss b/src/assets/scss/base/utilities/_sizing.scss
similarity index 100%
rename from src/styles/base/utilities/_sizing.scss
rename to src/assets/scss/base/utilities/_sizing.scss
diff --git a/src/styles/base/utilities/_space-content.scss b/src/assets/scss/base/utilities/_space-content.scss
similarity index 100%
rename from src/styles/base/utilities/_space-content.scss
rename to src/assets/scss/base/utilities/_space-content.scss
diff --git a/src/styles/base/utilities/_spacings.scss b/src/assets/scss/base/utilities/_spacings.scss
similarity index 100%
rename from src/styles/base/utilities/_spacings.scss
rename to src/assets/scss/base/utilities/_spacings.scss
diff --git a/src/styles/base/utilities/_sr-only.scss b/src/assets/scss/base/utilities/_sr-only.scss
similarity index 100%
rename from src/styles/base/utilities/_sr-only.scss
rename to src/assets/scss/base/utilities/_sr-only.scss
diff --git a/src/styles/base/utilities/_top-bottom.scss b/src/assets/scss/base/utilities/_top-bottom.scss
similarity index 100%
rename from src/styles/base/utilities/_top-bottom.scss
rename to src/assets/scss/base/utilities/_top-bottom.scss
diff --git a/src/styles/globals.scss b/src/assets/scss/globals.scss
similarity index 100%
rename from src/styles/globals.scss
rename to src/assets/scss/globals.scss

From 6e4f5b7b333743b3d7f87368afdd3ae25b64d599 Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 16:59:39 +0100
Subject: [PATCH 2/6] Move logo.svg to /assets/img folder

And migrate away from deprecated Astro.resolve()
---
 {public/assets => src/assets/img}/logo.svg | 0
 src/components/Header.astro                | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {public/assets => src/assets/img}/logo.svg (100%)

diff --git a/public/assets/logo.svg b/src/assets/img/logo.svg
similarity index 100%
rename from public/assets/logo.svg
rename to src/assets/img/logo.svg
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 7c28676..6f41727 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -8,7 +8,7 @@ import SkipLinks from '../components/SkipLinks.astro'
   <SkipLinks client:load />
   <section class="padding-16 color-neutral">
     <div class="container temp">
-      <img src="assets/logo.svg" alt="Your Logo">
+      <img src={(await import('../assets/img/logo.svg')).default} alt="Your Logo">
       <ResponsiveToggle client:load />
       <Navigation client:load />
     </div>
@@ -16,7 +16,7 @@ import SkipLinks from '../components/SkipLinks.astro'
 </header>
 
 <style lang="scss">
-  @use '../styles/base/breakpoint' as *;
+  @use '../assets/scss/base/breakpoint' as *;
 
   .container {
     display: flex;

From 02166abd647fa9aa6a73e2b29fd46852bfc71ec8 Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 16:59:59 +0100
Subject: [PATCH 3/6] Update style references

---
 src/components/Navigation.astro       | 2 +-
 src/components/ResponsiveToggle.astro | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Navigation.astro b/src/components/Navigation.astro
index 1677939..7e4b3ef 100644
--- a/src/components/Navigation.astro
+++ b/src/components/Navigation.astro
@@ -54,7 +54,7 @@
 </script>
 
 <style lang="scss">
-  @use '../styles/base/breakpoint' as *;
+  @use '../assets/scss/base/breakpoint' as *;
 
   nav {
     display: none;
diff --git a/src/components/ResponsiveToggle.astro b/src/components/ResponsiveToggle.astro
index 8ea7743..7620c1c 100644
--- a/src/components/ResponsiveToggle.astro
+++ b/src/components/ResponsiveToggle.astro
@@ -41,8 +41,8 @@
 </script>
 
 <style lang="scss">
-  @use "../styles/base/breakpoint" as *;
-  @use "../styles/base/outline" as *;
+  @use "../assets/scss/base/breakpoint" as *;
+  @use "../assets/scss/base/outline" as *;
 
   .responsive-toggle {
     &:focus {

From 361f7606d5bfe195a674ba9593d4a91227fd3b73 Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 17:00:40 +0100
Subject: [PATCH 4/6] Import styles the recommended way

And clean-up line-breaks and comments
---
 src/layouts/DefaultLayout.astro | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro
index ba327e9..c7cd983 100644
--- a/src/layouts/DefaultLayout.astro
+++ b/src/layouts/DefaultLayout.astro
@@ -1,4 +1,5 @@
 ---
+import '../assets/scss/globals.scss'
 import Header from '../components/Header.astro'
 import Footer from '../components/Footer.astro'
 
@@ -20,9 +21,6 @@ let subtitle = 'Accessible Astro Starter'
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;800&display=swap" rel="stylesheet">
 
-    <!-- global css -->
-    <link rel="stylesheet" href={Astro.resolve('../styles/globals.scss')} />
-
     <!-- open graph -->
     <meta property="og:title" content="Accessible Astro Starter">
     <meta property="og:description" content="A starter project with accessible features using Astro static site builder. Contains accessible landmarks, skip links, a dark mode color scheme, better focus outline and keyboard menu navigation.">
@@ -34,20 +32,11 @@ let subtitle = 'Accessible Astro Starter'
     <title>{title} - {subtitle}</title>
   </head>
   <body>
-
-    <!-- header -->
     <Header />
-
-    <!-- main -->
     <main id="main-content">
-
       <slot />
-
     </main>
-
-    <!-- footer -->
     <Footer />
-
   </body>
 </html>
 

From a0765b63dbe5f5ed3241647bac28eda419dfa59c Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 17:00:52 +0100
Subject: [PATCH 5/6] Update Astro to version 0.23.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2685e42..4812e6f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "astro build"
   },
   "devDependencies": {
-    "astro": "^0.23.1",
+    "astro": "^0.23.2",
     "autoprefixer": "^10.4.0",
     "sass": "^1.49.9",
     "stylelint": "^13.13.1",

From 6c1f057ccfe41f3c667e98364cd35bcca3e88191 Mon Sep 17 00:00:00 2001
From: Mark Teekman <mark.teekman@gmail.com>
Date: Sun, 27 Feb 2022 17:01:21 +0100
Subject: [PATCH 6/6] Update version to 1.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4812e6f..437852b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "accessible-astro-starter",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "start": "astro dev",