mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23798 from nextcloud/add/default_font_size 

Add default font size
This commit is contained in:
marco 2020-11-03 18:25:27 +01:00 committed by GitHub
parent a6908b82a9 bfe87e501d
commit 5c93321354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/src/components/Markdown.vue
View File

@ -146,7 +146,7 @@ export default {
} }
h6 { h6 {
font-size: 14px; font-size: var(--default-font-size);
} }
pre { pre {

3
core/css/css-variables.scss
View File

@ -46,6 +46,9 @@
--border-radius-pill: $border-radius-pill; --border-radius-pill: $border-radius-pill;
--font-face: $font-face; --font-face: $font-face;
--default-font-size: $default-font-size;
--default-line-height: $default-line-height;
--animation-quick: $animation-quick; --animation-quick: $animation-quick;
--animation-slow: $animation-slow; --animation-slow: $animation-slow;

4
core/css/styles.scss
View File

@ -89,8 +89,8 @@ body {
background-color: var(--color-main-background); background-color: var(--color-main-background);
font-weight: normal; font-weight: normal;
/* bring the default font size up to 15px */ /* bring the default font size up to 15px */
font-size: .9375em; font-size: var(--default-font-size);
line-height: 1.6em; line-height: var(--default-line-height);
font-family: var(--font-face); font-family: var(--font-face);
color: var(--color-main-text); color: var(--color-main-text);
} }

3
core/css/variables.scss
View File

@ -87,6 +87,9 @@ $border-radius-large: 10px !default;
$border-radius-pill: 100px !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; $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-quick: 100ms;
$animation-slow: 300ms; $animation-slow: 300ms;

2
core/src/components/UnifiedSearch/SearchResult.vue
View File

@ -250,7 +250,7 @@ $margin: 10px;
} }
&-line-two { &-line-two {
opacity: .7; opacity: .7;
font-size: 14px; font-size: var(--default-font-size);
} }
} }

2
core/src/views/UnifiedSearch.vue
View File

@ -744,7 +744,7 @@ $input-padding: 6px;
::v-deep .empty-content__title { ::v-deep .empty-content__title {
font-weight: normal; font-weight: normal;
font-size: 14px; font-size: var(--default-font-size);
padding: 0 15px; padding: 0 15px;
text-align: center; text-align: center;
} }