Merge pull request #17 from markteekman/develop

Develop
markteekman · Feb 27, 2022 · d802de0 · d802de0
2 parents 4ed951b + 6c1f057
commit d802de0
Show file tree

Hide file tree

Showing 43 changed files with 8 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "accessible-astro-starter",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "start": "astro dev",
     "build": "astro build"
   },
   "devDependencies": {
-    "astro": "^0.23.1",
+    "astro": "^0.23.2",
     "autoprefixer": "^10.4.0",
     "sass": "^1.49.9",
     "stylelint": "^13.13.1",

diff --git a/public/assets/logo.svg → src/assets/img/logo.svg b/public/assets/logo.svg → src/assets/img/logo.svg
diff --git a/src/styles/base/_auto-grid.scss → src/assets/scss/base/_auto-grid.scss b/src/styles/base/_auto-grid.scss → src/assets/scss/base/_auto-grid.scss
diff --git a/src/styles/base/_border.scss → src/assets/scss/base/_border.scss b/src/styles/base/_border.scss → src/assets/scss/base/_border.scss
diff --git a/src/styles/base/_breakpoint.scss → src/assets/scss/base/_breakpoint.scss b/src/styles/base/_breakpoint.scss → src/assets/scss/base/_breakpoint.scss
diff --git a/src/styles/base/_color.scss → src/assets/scss/base/_color.scss b/src/styles/base/_color.scss → src/assets/scss/base/_color.scss
diff --git a/src/styles/base/_elevation.scss → src/assets/scss/base/_elevation.scss b/src/styles/base/_elevation.scss → src/assets/scss/base/_elevation.scss
diff --git a/src/styles/base/_font.scss → src/assets/scss/base/_font.scss b/src/styles/base/_font.scss → src/assets/scss/base/_font.scss
diff --git a/src/styles/base/_grid.scss → src/assets/scss/base/_grid.scss b/src/styles/base/_grid.scss → src/assets/scss/base/_grid.scss
diff --git a/src/styles/base/_list.scss → src/assets/scss/base/_list.scss b/src/styles/base/_list.scss → src/assets/scss/base/_list.scss
diff --git a/src/styles/base/_outline.scss → src/assets/scss/base/_outline.scss b/src/styles/base/_outline.scss → src/assets/scss/base/_outline.scss
diff --git a/src/styles/base/_reset.scss → src/assets/scss/base/_reset.scss b/src/styles/base/_reset.scss → src/assets/scss/base/_reset.scss
diff --git a/src/styles/base/_root.scss → src/assets/scss/base/_root.scss b/src/styles/base/_root.scss → src/assets/scss/base/_root.scss
diff --git a/src/styles/base/_size.scss → src/assets/scss/base/_size.scss b/src/styles/base/_size.scss → src/assets/scss/base/_size.scss
diff --git a/src/styles/base/_space.scss → src/assets/scss/base/_space.scss b/src/styles/base/_space.scss → src/assets/scss/base/_space.scss
diff --git a/src/styles/base/_utility.scss → src/assets/scss/base/_utility.scss b/src/styles/base/_utility.scss → src/assets/scss/base/_utility.scss
diff --git a/src/styles/base/keyframes/_blink.scss → src/assets/scss/base/keyframes/_blink.scss b/src/styles/base/keyframes/_blink.scss → src/assets/scss/base/keyframes/_blink.scss
diff --git a/src/styles/base/keyframes/_fade-in.scss → src/assets/scss/base/keyframes/_fade-in.scss b/src/styles/base/keyframes/_fade-in.scss → src/assets/scss/base/keyframes/_fade-in.scss
diff --git a/src/styles/base/keyframes/_pop-up.scss → src/assets/scss/base/keyframes/_pop-up.scss b/src/styles/base/keyframes/_pop-up.scss → src/assets/scss/base/keyframes/_pop-up.scss
diff --git a/src/styles/base/keyframes/_spin.scss → src/assets/scss/base/keyframes/_spin.scss b/src/styles/base/keyframes/_spin.scss → src/assets/scss/base/keyframes/_spin.scss
diff --git a/src/styles/base/utilities/_align-center.scss → ...ts/scss/base/utilities/_align-center.scss b/src/styles/base/utilities/_align-center.scss → ...ts/scss/base/utilities/_align-center.scss
diff --git a/...les/base/utilities/_align-horizontal.scss → ...css/base/utilities/_align-horizontal.scss b/...les/base/utilities/_align-horizontal.scss → ...css/base/utilities/_align-horizontal.scss
diff --git a/...tyles/base/utilities/_align-vertical.scss → .../scss/base/utilities/_align-vertical.scss b/...tyles/base/utilities/_align-vertical.scss → .../scss/base/utilities/_align-vertical.scss
diff --git a/src/styles/base/utilities/_animations.scss → ...sets/scss/base/utilities/_animations.scss b/src/styles/base/utilities/_animations.scss → ...sets/scss/base/utilities/_animations.scss
diff --git a/...styles/base/utilities/_border-radius.scss → ...s/scss/base/utilities/_border-radius.scss b/...styles/base/utilities/_border-radius.scss → ...s/scss/base/utilities/_border-radius.scss
diff --git a/src/styles/base/utilities/_colors.scss → src/assets/scss/base/utilities/_colors.scss b/src/styles/base/utilities/_colors.scss → src/assets/scss/base/utilities/_colors.scss
diff --git a/src/styles/base/utilities/_contents.scss → ...assets/scss/base/utilities/_contents.scss b/src/styles/base/utilities/_contents.scss → ...assets/scss/base/utilities/_contents.scss
diff --git a/src/styles/base/utilities/_elevations.scss → ...sets/scss/base/utilities/_elevations.scss b/src/styles/base/utilities/_elevations.scss → ...sets/scss/base/utilities/_elevations.scss
diff --git a/src/styles/base/utilities/_gutter-gap.scss → ...sets/scss/base/utilities/_gutter-gap.scss b/src/styles/base/utilities/_gutter-gap.scss → ...sets/scss/base/utilities/_gutter-gap.scss
diff --git a/src/styles/base/utilities/_height-width.scss → ...ts/scss/base/utilities/_height-width.scss b/src/styles/base/utilities/_height-width.scss → ...ts/scss/base/utilities/_height-width.scss
diff --git a/src/styles/base/utilities/_margins.scss → src/assets/scss/base/utilities/_margins.scss b/src/styles/base/utilities/_margins.scss → src/assets/scss/base/utilities/_margins.scss
diff --git a/src/styles/base/utilities/_paddings.scss → ...assets/scss/base/utilities/_paddings.scss b/src/styles/base/utilities/_paddings.scss → ...assets/scss/base/utilities/_paddings.scss
diff --git a/src/styles/base/utilities/_size-content.scss → ...ts/scss/base/utilities/_size-content.scss b/src/styles/base/utilities/_size-content.scss → ...ts/scss/base/utilities/_size-content.scss
diff --git a/src/styles/base/utilities/_sizing.scss → src/assets/scss/base/utilities/_sizing.scss b/src/styles/base/utilities/_sizing.scss → src/assets/scss/base/utilities/_sizing.scss
diff --git a/...styles/base/utilities/_space-content.scss → ...s/scss/base/utilities/_space-content.scss b/...styles/base/utilities/_space-content.scss → ...s/scss/base/utilities/_space-content.scss
diff --git a/src/styles/base/utilities/_spacings.scss → ...assets/scss/base/utilities/_spacings.scss b/src/styles/base/utilities/_spacings.scss → ...assets/scss/base/utilities/_spacings.scss
diff --git a/src/styles/base/utilities/_sr-only.scss → src/assets/scss/base/utilities/_sr-only.scss b/src/styles/base/utilities/_sr-only.scss → src/assets/scss/base/utilities/_sr-only.scss
diff --git a/src/styles/base/utilities/_top-bottom.scss → ...sets/scss/base/utilities/_top-bottom.scss b/src/styles/base/utilities/_top-bottom.scss → ...sets/scss/base/utilities/_top-bottom.scss
diff --git a/src/styles/globals.scss → src/assets/scss/globals.scss b/src/styles/globals.scss → src/assets/scss/globals.scss
diff --git a/src/components/Header.astro b/src/components/Header.astro
@@ -8,15 +8,15 @@ 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>
   </section>
 </header>
 
 <style lang="scss">
-  @use '../styles/base/breakpoint' as *;
+  @use '../assets/scss/base/breakpoint' as *;
 
   .container {
     display: flex;

diff --git 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
@@ -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 {

diff --git 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>