Browse Source
Merge pull request #23798 from nextcloud/add/default_font_size
Add default font size
pull/23881/head
marco
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
11 additions and
5 deletions
-
apps/settings/src/components/Markdown.vue
-
core/css/css-variables.scss
-
core/css/styles.scss
-
core/css/variables.scss
-
core/src/components/UnifiedSearch/SearchResult.vue
-
core/src/views/UnifiedSearch.vue
|
|
|
@ -146,7 +146,7 @@ export default { |
|
|
|
} |
|
|
|
|
|
|
|
h6 { |
|
|
|
font-size: 14px; |
|
|
|
font-size: var(--default-font-size); |
|
|
|
} |
|
|
|
|
|
|
|
pre { |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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); |
|
|
|
} |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -250,7 +250,7 @@ $margin: 10px; |
|
|
|
} |
|
|
|
&-line-two { |
|
|
|
opacity: .7; |
|
|
|
font-size: 14px; |
|
|
|
font-size: var(--default-font-size); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
} |
|
|
|
|