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

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
parent 841801b9ac 6787f5de50
commit 7ad87937c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/js/vue-settings-apps-489d5f46c67b4e8fbf67.js Normal file
View File

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-settings-apps-489d5f46c67b4e8fbf67.js.map Normal file
View File

File diff suppressed because one or more lines are too long

4
apps/settings/js/vue-settings-apps-users-management.js
View File

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View File

File diff suppressed because one or more lines are too long

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;

5
core/css/styles.scss
View File

@ -88,9 +88,8 @@ ul {
body { 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 14px */ font-size: var(--default-font-size);
font-size: .875em; line-height: var(--default-line-height);
line-height: 1.6em;
font-family: var(--font-face); font-family: var(--font-face);
color: var(--color-main-text); color: var(--color-main-text);
} }

2
core/css/variables.scss
View File

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

2
core/js/dist/unified-search.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js.map vendored
View File

File diff suppressed because one or more lines are too long

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