Consistency in defining defaults for font-size, 9.1.2

digitoimistodude · Sep 7, 2022 · bb436d2 · bb436d2
1 parent 00c33fa
commit bb436d2
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
-### [Unreleased]
+### 9.1.2: 2022-09-07
 
 * Clean up is-external-link from CSS that is no longer used
+* Consistency in variables: `--font-size-paragraphs` -> `--font-size-paragraph`
+* Remove unused `--font-size-default` and combine with `--font-size-paragraph`
+* Fix list font-sizes not inheriting from paragraph styles
+* Define default font sizes and line-heights on body level instead in separate elements
 
 ### 9.1.1: 2022-09-06
 

diff --git a/bin/tasks/additions.sh b/bin/tasks/additions.sh
@@ -10,7 +10,7 @@ chmod 777 ${PROJECT_PATH}/media
 
 echo "${YELLOW}Generating default README.md...${TXTRESET}"
 
-NEWEST_AIR_VERSION="9.1.1"
+NEWEST_AIR_VERSION="9.1.2"
 NEWEST_WORDPRESS_VERSION="6.0.2"
 NEWEST_PHP_VERSION="7.4"
 CURRENT_DATE=$(LC_TIME=en_US date '+%d %b %Y' |tr ' ' '_');

diff --git a/css/dev/global.css b/css/dev/global.css
diff --git a/css/dev/gutenberg-editor-styles.css b/css/dev/gutenberg-editor-styles.css
diff --git a/css/prod/global.css b/css/prod/global.css
diff --git a/css/prod/gutenberg-editor-styles.css b/css/prod/gutenberg-editor-styles.css
diff --git a/functions.php b/functions.php
@@ -7,7 +7,7 @@
  *
  * @Date: 2019-10-15 12:30:02
  * @Last Modified by:   Roni Laukkarinen
- * @Last Modified time: 2022-09-06 15:29:13
+ * @Last Modified time: 2022-09-07 11:41:39
  *
  * @package air-light
  */
@@ -17,7 +17,7 @@
 /**
  * The current version of the theme.
  */
-define( 'AIR_LIGHT_VERSION', '9.1.1' );
+define( 'AIR_LIGHT_VERSION', '9.1.2' );
 
 // We need to have some defaults as comments or empties so let's allow this:
 // phpcs:disable Squiz.Commenting.InlineComment.SpacingBefore, WordPress.Arrays.ArrayDeclarationSpacing.SpaceInEmptyArray
@@ -75,6 +75,7 @@
       'localhost:3000',
       'airdev.test',
       'airwptheme.com',
+      'localhost',
     ],
 
     /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "air-light",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "A minimalist WordPress starter theme.",
   "author": "Digitoimisto Dude Oy ([email protected])",
   "devDependencies": {

diff --git a/readme.txt b/readme.txt
@@ -12,7 +12,7 @@ Tags: one-column, accessibility-ready, translation-ready
 
 Requires at least: 5.0
 Tested up to: 6.0.2
-Stable tag: 9.1.1
+Stable tag: 9.1.2
 License: MIT License
 License URI: https://opensource.org/licenses/MIT
 

diff --git a/sass/gutenberg/blocks/_core-list.scss b/sass/gutenberg/blocks/_core-list.scss
@@ -19,5 +19,5 @@ ol {
 // Colorized markers
 li::marker {
   color: var(--color-link-text);
-  font-size: var(--font-size-16);
+  font-size: inherit;
 }
diff --git a/sass/layout/_forms.scss b/sass/layout/_forms.scss
@@ -47,7 +47,6 @@ input[type="month"],
 input[type="week"],
 input[type="email"],
 input[type="search"] {
-  @extend %default;
   background-color: var(--color-background-input-field);
   border-color: var(--color-border-forms);
   border-radius: var(--border-radius-input-field);

diff --git a/sass/layout/_typography.scss b/sass/layout/_typography.scss
@@ -12,10 +12,11 @@
 body {
   color: var(--color-paragraph);
   font-family: var(--font-paragraph);
-  font-size: var(--font-size-default);
+  font-size: var(--font-size-paragraph);
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   font-weight: var(--font-weight-paragraphs);
+  line-height: var(--line-height-paragraph);
   // stylelint-disable-next-line value-keyword-case
   text-rendering: geometricPrecision;
 }
@@ -38,10 +39,9 @@ code,
 th,
 td,
 table,
-tr,
-%default {
-  font-size: var(--font-size-paragraphs);
-  line-height: var(--line-height-paragraph);
+tr {
+  font-size: inherit;
+  line-height: inherit;
 }
 
 // Heading defaults

diff --git a/sass/variables/_font-size.scss b/sass/variables/_font-size.scss
@@ -19,8 +19,7 @@
   --font-size-22: 22px;
 
   // Element font sizes
-  --font-size-default: var(--font-size-17);
-  --font-size-paragraphs: var(--font-size-18);
+  --font-size-paragraph: var(--font-size-18);
   --font-size-nav-toggle-label: 15px;
   --font-size-captions: 15px;
 
@@ -46,8 +45,7 @@
     --font-size-h4: 18px;
     --font-size-h5: 14px;
     --font-size-h6: 12px;
-    --font-size-paragraphs: 16px;
-    --font-size-default: 16px;
+    --font-size-paragraph: 16px;
   }
 
   // Element font sizes in tiny phones like iPhone 5S

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://github.com/digitoimistodude/air-light
 Author: Digitoimisto Dude Oy
 Author URI: https://www.dude.fi
 Description: Hi. I'm a starter theme called <code>Air-light</code>, or <em>air</em>, if you like. I'm a theme based on Automattic's underscores and I'm meant for hacking so don't use me as a <em>Parent Theme</em> as-is. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
-Version: 9.1.1
+Version: 9.1.2
 
 ------8<----------
 Please do this before your actual theme is ready to go live:
@@ -20,7 +20,7 @@ If you see this, contact the site admin.
 /*---------------------------------------------------------------
 >>> Air-light theme version information, only for AIR developers
 -----------------------------------------------------------------
-@version 2022-09-06
+@version 2022-09-07
 @since 2016-01-28
 
 Tested up to: 6.0.2