From 498acb77f2f7c44c1c98beed9147fb8e2eb966f7 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Wed, 2 Aug 2023 18:37:53 +0100 Subject: Applies Prettier --- frontend/.prettierrc | 2 +- frontend/README.md | 2 +- frontend/public/main.css | 13 +++-- frontend/public/normalize.css | 40 ++++++++-------- frontend/src/components/Footer.astro | 3 +- frontend/src/layouts/Layout.astro | 34 ++++++------- frontend/src/pages/index.astro | 92 ++++++++++++++++++------------------ frontend/tsconfig.json | 2 +- 8 files changed, 98 insertions(+), 90 deletions(-) diff --git a/frontend/.prettierrc b/frontend/.prettierrc index f0acc0f..727eb83 100644 --- a/frontend/.prettierrc +++ b/frontend/.prettierrc @@ -5,4 +5,4 @@ "trailingComma": "es5", "plugins": ["prettier-plugin-astro"], "overrides": [{ "files": "*.astro", "options": { "parser": "astro" } }] -} \ No newline at end of file +} diff --git a/frontend/README.md b/frontend/README.md index 21b8e93..e4c21c4 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -5,4 +5,4 @@ wi static site generation. ## Get yokit -`npm i && npm run dev` \ No newline at end of file +`npm i && npm run dev` diff --git a/frontend/public/main.css b/frontend/public/main.css index 11e81b2..dd8de49 100644 --- a/frontend/public/main.css +++ b/frontend/public/main.css @@ -70,7 +70,11 @@ background-color: var(--color-primary-100); } -.title, h1, h2, h3, h4 { +.title, +h1, +h2, +h3, +h4 { font-family: Alegreya, 'Goudy Old Style', Garamond, serif; } @@ -85,7 +89,10 @@ padding-block-start: 0; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { padding-block-start: var(--spacing-block-lg); } @@ -305,4 +312,4 @@ footer { .back-to-top-link { margin-inline-end: 0; } -} \ No newline at end of file +} diff --git a/frontend/public/normalize.css b/frontend/public/normalize.css index a10992b..7e8a037 100644 --- a/frontend/public/normalize.css +++ b/frontend/public/normalize.css @@ -8,7 +8,7 @@ * 2. Prevent adjustments of font size after orientation changes in iOS. */ - html { +html { line-height: 1.15; /* 1 */ -webkit-text-size-adjust: 100%; /* 2 */ } @@ -174,7 +174,8 @@ textarea { */ button, -input { /* 1 */ +input { + /* 1 */ overflow: visible; } @@ -184,7 +185,8 @@ input { /* 1 */ */ button, -select { /* 1 */ +select { + /* 1 */ text-transform: none; } @@ -193,9 +195,9 @@ select { /* 1 */ */ button, -[type="button"], -[type="reset"], -[type="submit"] { +[type='button'], +[type='reset'], +[type='submit'] { -webkit-appearance: button; } @@ -204,9 +206,9 @@ button, */ button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { +[type='button']::-moz-focus-inner, +[type='reset']::-moz-focus-inner, +[type='submit']::-moz-focus-inner { border-style: none; padding: 0; } @@ -216,9 +218,9 @@ button::-moz-focus-inner, */ button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { +[type='button']:-moz-focusring, +[type='reset']:-moz-focusring, +[type='submit']:-moz-focusring { outline: 1px dotted ButtonText; } @@ -267,8 +269,8 @@ textarea { * 2. Remove the padding in IE 10. */ -[type="checkbox"], -[type="radio"] { +[type='checkbox'], +[type='radio'] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } @@ -277,8 +279,8 @@ textarea { * Correct the cursor style of increment and decrement buttons in Chrome. */ -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { +[type='number']::-webkit-inner-spin-button, +[type='number']::-webkit-outer-spin-button { height: auto; } @@ -287,7 +289,7 @@ textarea { * 2. Correct the outline style in Safari. */ -[type="search"] { +[type='search'] { -webkit-appearance: textfield; /* 1 */ outline-offset: -2px; /* 2 */ } @@ -296,7 +298,7 @@ textarea { * Remove the inner padding in Chrome and Safari on macOS. */ -[type="search"]::-webkit-search-decoration { +[type='search']::-webkit-search-decoration { -webkit-appearance: none; } @@ -350,4 +352,4 @@ template { :visited { color: inherit; -} \ No newline at end of file +} diff --git a/frontend/src/components/Footer.astro b/frontend/src/components/Footer.astro index 9f8b9b7..6ad0052 100644 --- a/frontend/src/components/Footer.astro +++ b/frontend/src/components/Footer.astro @@ -1,8 +1,9 @@ --- + --- \ No newline at end of file + diff --git a/frontend/src/layouts/Layout.astro b/frontend/src/layouts/Layout.astro index 047538c..1a47613 100644 --- a/frontend/src/layouts/Layout.astro +++ b/frontend/src/layouts/Layout.astro @@ -1,8 +1,8 @@ --- import Footer from '../components/Footer.astro'; - + interface Props { - title: string; + title: string; } const { title } = Astro.props; @@ -10,18 +10,18 @@ const { title } = Astro.props; - - - - - - - - - {title} | Scots Leid Associe - - - -