Merge pull request #722 from tempertemper/release/6.0.1

Release version 6.0.1

.changelog

@@ -14,6 +14,18 @@ All notable changes to this project will be documented in this file. The format
 ----------
 
 
+## [6.0.1] - 2021-07-04
+
+### 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
+
+
 ## [6.0.0] - 2021-07-03
 
 ### Adds

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",

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;

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';

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';

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",