From 20d65ac3bd10096bb774c8cd6b55ce424ddeda8e Mon Sep 17 00:00:00 2001 From: Martin Underhill Date: Sun, 4 Jul 2021 08:27:16 +0100 Subject: [PATCH 1/4] Removes unnecessary or overridden CSS reset properties --- .changelog | 4 +++ src/scss/base/_reset.scss | 68 ++++++++++++++------------------------- 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/.changelog b/.changelog index 5434b422a..28ce20672 100644 --- a/.changelog +++ b/.changelog @@ -11,6 +11,10 @@ All notable changes to this project will be documented in this file. The format ## [Unreleased] +### Removes +- Removes unnecessary or overridden CSS reset properties +- Comments out currently unused styles in CSS reset + ---------- diff --git a/src/scss/base/_reset.scss b/src/scss/base/_reset.scss index 512e96107..b8c242523 100644 --- a/src/scss/base/_reset.scss +++ b/src/scss/base/_reset.scss @@ -22,15 +22,7 @@ p { } } -pre, -code { - font-size: inherit; - font-weight: 400; -} - -address, -pre, -.map { +address { margin-bottom: 1em; margin-top: 1em; } @@ -40,47 +32,35 @@ ol { padding-left: 0; } -pre, body, html, -fieldset, +// fieldset, input { margin: 0; padding: 0; } -address, -cite { +// cite, +address { font-style: normal; } -:focus { - outline: none; -} - -a img, img, -iframe, -fieldset { +// fieldset, +iframe { border: 0; } -legend { - color: $colour-black; - padding: 0; -} +// legend { +// padding: 0; +// } -input, -textarea, -select { +// textarea, +// select, +input { font-family: inherit; font-size: 100%; margin: 0; - padding: 1px; -} - -select { - padding: 0; } table { @@ -92,17 +72,17 @@ table { cursor: pointer; } -[type="search"] { - -webkit-appearance: none; - border-radius: $border-radius-default; - box-shadow: none; -} +// [type="search"] { +// -webkit-appearance: none; +// border-radius: $border-radius-default; +// box-shadow: none; +// } +// textarea, +// [type="tel"], +// [type="url"], [type="text"], -[type="email"], -[type="tel"], -[type="url"], -textarea { +[type="email"] { -webkit-appearance: none; } @@ -115,9 +95,9 @@ button { background-image: none; } -nav .selected { - cursor: default; -} +// nav .selected { +// cursor: default; +// } textarea { overflow-y: auto; From 97e788efe6290327163cd4d974d99d5e545537dc Mon Sep 17 00:00:00 2001 From: Martin Underhill Date: Sun, 4 Jul 2021 08:35:36 +0100 Subject: [PATCH 2/4] Moves more below-the-fold styling to enhanced.css --- .changelog | 5 +++++ .../{_mixins.scss => mixins/_general.scss} | 0 .../mixins/_typography.scss} | 0 src/scss/base/{typography => }/_code.scss | 0 src/scss/enhanced.scss | 21 ++++++++++++++++--- src/scss/styles.scss | 20 ++++-------------- 6 files changed, 27 insertions(+), 19 deletions(-) rename src/scss/admin/{_mixins.scss => mixins/_general.scss} (100%) rename src/scss/{base/typography/_mixins.scss => admin/mixins/_typography.scss} (100%) rename src/scss/base/{typography => }/_code.scss (100%) diff --git a/.changelog b/.changelog index 28ce20672..b98207c73 100644 --- a/.changelog +++ b/.changelog @@ -11,6 +11,11 @@ All notable changes to this project will be documented in this file. The format ## [Unreleased] +### Changes +- Moves more below-the-fold styling to enhanced.css +- Puts typography mixins in the /admin/ directory +- Moves code styling out of typography + ### Removes - Removes unnecessary or overridden CSS reset properties - Comments out currently unused styles in CSS reset diff --git a/src/scss/admin/_mixins.scss b/src/scss/admin/mixins/_general.scss similarity index 100% rename from src/scss/admin/_mixins.scss rename to src/scss/admin/mixins/_general.scss diff --git a/src/scss/base/typography/_mixins.scss b/src/scss/admin/mixins/_typography.scss similarity index 100% rename from src/scss/base/typography/_mixins.scss rename to src/scss/admin/mixins/_typography.scss diff --git a/src/scss/base/typography/_code.scss b/src/scss/base/_code.scss similarity index 100% rename from src/scss/base/typography/_code.scss rename to src/scss/base/_code.scss diff --git a/src/scss/enhanced.scss b/src/scss/enhanced.scss index 3fb4ae07a..c70e26d72 100644 --- a/src/scss/enhanced.scss +++ b/src/scss/enhanced.scss @@ -1,5 +1,20 @@ -@import 'admin/variables', - 'admin/mixins', +@import '../../node_modules/modularscale-sass/stylesheets/modularscale', + 'admin/variables', + 'admin/mixins/general', + 'admin/mixins/typography', 'admin/placeholders'; -@import 'components/syntax-highlighting'; +@import 'base/code', + 'base/video', + 'base/icons', + 'base/buttons', + 'base/forms', + 'base/tables', + 'base/utility'; + +@import 'components/syntax-highlighting', + 'components/post-in-list', + 'components/post-details', + 'components/teaser', + 'components/subscribe', + 'components/footer'; diff --git a/src/scss/styles.scss b/src/scss/styles.scss index ee19643f5..0a77db971 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -1,30 +1,18 @@ @import '../../node_modules/modularscale-sass/stylesheets/modularscale', 'admin/variables', - 'admin/mixins', + 'admin/mixins/general', + 'admin/mixins/typography', 'admin/placeholders'; @import 'base/reset', 'base/typography/fonts', - 'base/typography/mixins', 'base/typography/general', 'base/typography/headings', 'base/typography/links', - 'base/typography/code', - 'base/images', - 'base/video', - 'base/icons', - 'base/buttons', - 'base/forms', - 'base/tables', - 'base/utility'; + 'base/images'; @import 'components/page', 'components/header', 'components/logo', 'components/skip-to-content', - 'components/navigation', - 'components/post-in-list', - 'components/post-details', - 'components/teaser', - 'components/subscribe', - 'components/footer'; + 'components/navigation'; From 2459272f38305479a88c1a743dd97919a83069b4 Mon Sep 17 00:00:00 2001 From: Martin Underhill Date: Sun, 4 Jul 2021 08:39:56 +0100 Subject: [PATCH 3/4] Updates changelog for 6.0.1 release --- .changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.changelog b/.changelog index b98207c73..1322eb8cf 100644 --- a/.changelog +++ b/.changelog @@ -11,6 +11,11 @@ All notable changes to this project will be documented in this file. The format ## [Unreleased] +---------- + + +## [6.0.1] - 2021-07-04 + ### Changes - Moves more below-the-fold styling to enhanced.css - Puts typography mixins in the /admin/ directory @@ -20,8 +25,6 @@ All notable changes to this project will be documented in this file. The format - Removes unnecessary or overridden CSS reset properties - Comments out currently unused styles in CSS reset ----------- - ## [6.0.0] - 2021-07-03 From a946b0b7e08403c8ecd9aed366dbce778b31925a Mon Sep 17 00:00:00 2001 From: Martin Underhill Date: Sun, 4 Jul 2021 08:40:05 +0100 Subject: [PATCH 4/4] Bumps version number to 6.0.1 --- package-lock.json | 2 +- package.json | 2 +- src/site/_data/site.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index abdbfc8ff..c20d72439 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tempertemper", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 53b7b168a..d7a915f60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tempertemper", - "version": "6.0.0", + "version": "6.0.1", "description": "tempertemper's website", "scripts": { "clear": "rm -rf dist", diff --git a/src/site/_data/site.json b/src/site/_data/site.json index e7c026260..83b2151d7 100644 --- a/src/site/_data/site.json +++ b/src/site/_data/site.json @@ -1,7 +1,7 @@ { "title": "tempertemper", "company": "tempertemper Web Design Ltd", - "version": "6.0.0", + "version": "6.0.1", "url": "https://www.tempertemper.net", "baseurl": "", "repo": "https://github.com/tempertemper/tempertemper-website",