From bfe87e501d83ff4dc9e5057c07464a598d951b4b Mon Sep 17 00:00:00 2001 From: GretaD Date: Fri, 30 Oct 2020 15:26:07 +0100 Subject: [PATCH] Add default font size Signed-off-by: GretaD --- apps/settings/src/components/Markdown.vue | 2 +- core/css/css-variables.scss | 3 +++ core/css/styles.scss | 4 ++-- core/css/variables.scss | 3 +++ core/src/components/UnifiedSearch/SearchResult.vue | 2 +- core/src/views/UnifiedSearch.vue | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/settings/src/components/Markdown.vue b/apps/settings/src/components/Markdown.vue index 74c333d839..1f7f9b01cf 100644 --- 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 8b09b00693..4190c6773e 100644 --- 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 e2fe4e787f..780a2085bc 100644 --- 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 6f2d19e872..cf7d919d72 100644 --- 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 025ddef86c..e50cc413d0 100644 --- 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 be33ac8cd8..b579ce72eb 100644 --- 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; }