From d90482d7194119611163f98c90e6ea1f3a560ba9 Mon Sep 17 00:00:00 2001
From: Paul DeBruicker <pdebruic@gmail.com>
Date: Sun, 28 Jun 2020 14:52:15 -0700
Subject: [PATCH] put the font size variables in variables.scss and rename the
ones misnamed -mq
---
_sass/support/_variables.scss | 14 ++++++++++++++
_sass/support/mixins/_typography.scss | 18 ++----------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/_sass/support/_variables.scss b/_sass/support/_variables.scss
index 3665a363..f32c65bd 100644
--- a/_sass/support/_variables.scss
+++ b/_sass/support/_variables.scss
@@ -10,6 +10,20 @@ $body-line-height: 1.4 !default;
$content-line-height: 1.6 !default;
$body-heading-line-height: 1.25 !default;
+// Font size
+$font-size-1: 9px;
+$font-size-1-sm: 10px;
+$font-size-2: 11px; //h4 - uppercased!, h6 not uppercased, text-small
+$font-size-3: 12px; //h5
+$font-size-4: 15px;
+$font-size-5: 16px; //h3
+$font-size-6: 18px; //h2
+$font-size-7: 24px;
+$font-size-8: 32px;//h1
+$font-size-9: 36px;
+$font-size-10: 42px;
+$font-size-10-sm: 48px;
+
//
// Colors
//
diff --git a/_sass/support/mixins/_typography.scss b/_sass/support/mixins/_typography.scss
index 02e5b869..62b78129 100644
--- a/_sass/support/mixins/_typography.scss
+++ b/_sass/support/mixins/_typography.scss
@@ -1,22 +1,8 @@
-// Font size
-$font-size-1: 9px;
-$font-size-1-mq: 10px;
-$font-size-2: 11px; //h4 - uppercased!, h6 not uppercased, text-small
-$font-size-3: 12px; //h5
-$font-size-4: 15px;
-$font-size-5: 16px; //h3
-$font-size-6: 18px; //h2
-$font-size-7: 24px;
-$font-size-8: 32px;//h1
-$font-size-9: 36px;
-$font-size-10: 42px;
-$font-size-10-mq: 48px;
-
@mixin fs-1 {
font-size: $font-size-1 !important;
@include mq(sm) {
- font-size: $font-size-1-mq !important;
+ font-size: $font-size-1-sm !important;
}
}
@@ -93,6 +79,6 @@ $font-size-10-mq: 48px;
line-height: $body-heading-line-height;
@include mq(sm) {
- font-size: $font-size-10-mq !important;
+ font-size: $font-size-10-sm !important;
}
}
--
GitLab