Merge pull request #23902 from nextcloud/backport/23798/stable20

[stable20] Add default font size
This commit is contained in:
Greta 2020-11-05 10:50:37 +01:00 committed by GitHub
commit 7ad87937c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 11 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

View File

@ -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;

View File

@ -88,9 +88,8 @@ ul {
body {
background-color: var(--color-main-background);
font-weight: normal;
/* bring the default font size up to 14px */
font-size: .875em;
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);
}

View File

@ -87,6 +87,8 @@ $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: 14px;
$default-line-height: 24px;
$animation-quick: 100ms;
$animation-slow: 300ms;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

View File

@ -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;
}