Merge pull request #4 from markteekman/develop

Develop
markteekman · Aug 28, 2021 · 7e3c22d · 7e3c22d
2 parents 0c32a3c + b5d0ba2
commit 7e3c22d
Show file tree

Hide file tree

Showing 19 changed files with 3,146 additions and 738 deletions.
diff --git a/public/.stylelintrc.json → .stylelintrc.json b/public/.stylelintrc.json → .stylelintrc.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "accessible-astro-starter",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "scripts": {
     "start": "astro dev",
     "build": "astro build"
   },
   "devDependencies": {
-    "astro": "^0.19.1",
+    "astro": "^0.20.3",
     "stylelint": "^13.13.1",
     "stylelint-config-standard": "^22.0.0"
   }

diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro
@@ -20,7 +20,7 @@ let subtitle = 'Accessible Astro Starter'
     <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;800&display=swap" rel="stylesheet">
 
     <!-- global css -->
-    <link rel="stylesheet" type="text/css" href="/styles/globals.css">
+    <link rel="stylesheet" href={Astro.resolve('../styles/globals.css')} />
 
     <!-- open graph -->
     <meta property="og:title" content="Accessible Astro Starter">
@@ -52,14 +52,14 @@ let subtitle = 'Accessible Astro Starter'
 
 <style lang="scss">
   // sticky footer on low content pages
-  html {
+  html,
+  body {
     height: 100%;
   }
 
   body {
     display: flex;
     flex-direction: column;
-    height: 100%;
     background-color: var(--background);
 
     main { flex: 1 0 auto; }

diff --git a/public/styles/base/_auto-grid.scss → src/styles/base/_auto-grid.scss b/public/styles/base/_auto-grid.scss → src/styles/base/_auto-grid.scss
diff --git a/public/styles/base/_breakpoint.scss → src/styles/base/_breakpoint.scss b/public/styles/base/_breakpoint.scss → src/styles/base/_breakpoint.scss
diff --git a/public/styles/base/_color.scss → src/styles/base/_color.scss b/public/styles/base/_color.scss → src/styles/base/_color.scss
diff --git a/public/styles/base/_elevation.scss → src/styles/base/_elevation.scss b/public/styles/base/_elevation.scss → src/styles/base/_elevation.scss
diff --git a/public/styles/base/_font.scss → src/styles/base/_font.scss b/public/styles/base/_font.scss → src/styles/base/_font.scss
diff --git a/public/styles/base/_grid.scss → src/styles/base/_grid.scss b/public/styles/base/_grid.scss → src/styles/base/_grid.scss
diff --git a/public/styles/base/_list.scss → src/styles/base/_list.scss b/public/styles/base/_list.scss → src/styles/base/_list.scss
diff --git a/public/styles/base/_outline.scss → src/styles/base/_outline.scss b/public/styles/base/_outline.scss → src/styles/base/_outline.scss
diff --git a/public/styles/base/_reset.scss → src/styles/base/_reset.scss b/public/styles/base/_reset.scss → src/styles/base/_reset.scss
diff --git a/public/styles/base/_root.scss → src/styles/base/_root.scss b/public/styles/base/_root.scss → src/styles/base/_root.scss
diff --git a/public/styles/base/_scheme.scss → src/styles/base/_scheme.scss b/public/styles/base/_scheme.scss → src/styles/base/_scheme.scss
diff --git a/public/styles/base/_size.scss → src/styles/base/_size.scss b/public/styles/base/_size.scss → src/styles/base/_size.scss
diff --git a/public/styles/base/_space.scss → src/styles/base/_space.scss b/public/styles/base/_space.scss → src/styles/base/_space.scss
diff --git a/public/styles/base/_utility.scss → src/styles/base/_utility.scss b/public/styles/base/_utility.scss → src/styles/base/_utility.scss
diff --git a/public/styles/globals.scss → src/styles/globals.scss b/public/styles/globals.scss → src/styles/globals.scss