Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/settings/src/components/Markdown.vue2
-rw-r--r--core/css/css-variables.scss3
-rw-r--r--core/css/styles.scss4
-rw-r--r--core/css/variables.scss3
-rw-r--r--core/src/components/UnifiedSearch/SearchResult.vue2
-rw-r--r--core/src/views/UnifiedSearch.vue2
6 files changed, 11 insertions, 5 deletions
diff --git a/apps/settings/src/components/Markdown.vue b/apps/settings/src/components/Markdown.vue
index 74c333d8398..1f7f9b01cf6 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 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;
diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index 025ddef86c0..e50cc413d03 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 be33ac8cd8d..b579ce72eb8 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;
}