Add default font size

Signed-off-by: GretaD <gretadoci@gmail.com>

diff --git a/apps/settings/src/components/Markdown.vue b/apps/settings/src/components/Markdown.vue
index 74c333d839858ec50c89ac182a71f9b2c253d9a0..1f7f9b01cf67afe3eae106e71c90cf83c595be4b 100644 (file)
--- a/apps/settings/src/components/Markdown.vue
+++ b/apps/settings/src/components/Markdown.vue
@@ -146,7 +146,7 @@ export default {
        }
 
        h6 {
-               font-size: 14px;
+               font-size: var(--default-font-size);
        }
 
        pre {

diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index 8b09b006939caef90108f4273a8955b96e0a08c5..4190c6773e1d09063002c1b4c244318e7aa5535e 100644 (file)
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -46,6 +46,9 @@
        --border-radius-pill: $border-radius-pill;
 
        --font-face: $font-face;
+       --default-font-size: $default-font-size;
+
+       --default-line-height: $default-line-height;
 
        --animation-quick: $animation-quick;
        --animation-slow: $animation-slow;

diff --git a/core/css/styles.scss b/core/css/styles.scss
index e2fe4e787f6b6410b8714a5c418b0d05821b9701..780a2085bc84e08fd23a0c478b4e52fc6b265860 100644 (file)
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -89,8 +89,8 @@ body {
        background-color: var(--color-main-background);
        font-weight: normal;
        /* bring the default font size up to 15px */
-       font-size: .9375em;
-       line-height: 1.6em;
+       font-size: var(--default-font-size);
+       line-height: var(--default-line-height);
        font-family: var(--font-face);
        color: var(--color-main-text);
 }

diff --git a/core/css/variables.scss b/core/css/variables.scss
index 6f2d19e87238087f464cd578401fccf003e0862c..cf7d919d72d5092b62bfae54c95c4f76d98a80e2 100644 (file)
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -87,6 +87,9 @@ $border-radius-large: 10px !default;
 $border-radius-pill: 100px !default;
 
 $font-face: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default;
+$default-font-size: 15px;
+
+$default-line-height: 24px;
 
 $animation-quick: 100ms;
 $animation-slow: 300ms;

diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index 025ddef86c06f80b18e2e7abe72689b00fb91e46..e50cc413d03836b792fdb4e75f4e46f58fe22cce 100644 (file)
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -250,7 +250,7 @@ $margin: 10px;
        }
        &-line-two {
                opacity: .7;
-               font-size: 14px;
+               font-size: var(--default-font-size);
        }
 }
 

diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue
index be33ac8cd8d3208c191903f022fae08e5f19eca8..b579ce72eb8c71b39402b74c9934ab9af5f0d407 100644 (file)
--- a/core/src/views/UnifiedSearch.vue
+++ b/core/src/views/UnifiedSearch.vue
@@ -744,7 +744,7 @@ $input-padding: 6px;
 
                ::v-deep .empty-content__title {
                        font-weight: normal;
-            font-size: 14px;
+            font-size: var(--default-font-size);
                        padding: 0 15px;
                        text-align: center;
                }