summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorGretaD <gretadoci@gmail.com>2020-10-30 15:26:07 +0100
committerGretaD <gretadoci@gmail.com>2020-11-03 13:58:04 +0100
commitbfe87e501d83ff4dc9e5057c07464a598d951b4b (patch)
tree184f6f2b203bcfe2413cff585347dd7bd0b4a1e5 /core/css
parent9d5362dd8e368a51d0e2fe98db9dc798b656720c (diff)
downloadnextcloud-server-bfe87e501d83ff4dc9e5057c07464a598d951b4b.tar.gz
nextcloud-server-bfe87e501d83ff4dc9e5057c07464a598d951b4b.zip
Add default font size
Signed-off-by: GretaD <gretadoci@gmail.com>
Diffstat (limited to 'core/css')
-rw-r--r--core/css/css-variables.scss3
-rw-r--r--core/css/styles.scss4
-rw-r--r--core/css/variables.scss3
3 files changed, 8 insertions, 2 deletions
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index 8b09b006939..4190c6773e1 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 e2fe4e787f6..780a2085bc8 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 6f2d19e8723..cf7d919d72d 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;