IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

FontSize: Change base font size to 14px (#21104)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-12-16 17:45:33 +01:00 committed by GitHub
parent 842dde3dc9
commit 4f1fffb948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-data/src/types/theme.ts
View File

@ -19,7 +19,6 @@ export interface GrafanaThemeCommons {
monospace: string;
};
size: {
root: string;
base: string;
xs: string;
sm: string;

1
packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
View File

@ -99,7 +99,6 @@ $height-lg: ${theme.height.lg};
$font-family-sans-serif: ${theme.typography.fontFamily.sansSerif};
$font-family-monospace: ${theme.typography.fontFamily.monospace};
$font-size-root: ${theme.typography.size.root} !default;
$font-size-base: ${theme.typography.size.base} !default;
$font-size-lg: ${theme.typography.size.lg} !default;

3
packages/grafana-ui/src/themes/default.ts
View File

@ -31,8 +31,7 @@ const theme: GrafanaThemeCommons = {
monospace: "Menlo, Monaco, Consolas, 'Courier New', monospace",
},
size: {
root: '14px',
base: '13px',
base: '14px',
xs: '10px',
sm: '12px',
md: '14px',

3
public/sass/_variables.generated.scss
View File

@ -102,8 +102,7 @@ $height-lg: 48px;
$font-family-sans-serif: 'Roboto', 'Helvetica Neue', Arial, sans-serif;
$font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace;
$font-size-root: 14px !default;
$font-size-base: 13px !default;
$font-size-base: 14px !default;
$font-size-lg: 18px !default;
$font-size-md: 14px !default;

3
public/sass/base/_reboot.scss
View File

@ -55,7 +55,7 @@ html {
html {
// Sets a specific default `font-size` for user with `rem` type scales.
font-size: $font-size-root;
font-size: $font-size-base;
// As a side-effect of setting the @viewport above,
// IE11 & Edge make the scrollbar overlap the content and automatically hide itself when not in use.
// Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive,
@ -69,7 +69,6 @@ html {
}
body {
// Make the `body` use the `font-size-root`
font-family: $font-family-sans-serif;
font-size: $font-size-base;
line-height: $line-height-base;

2
public/sass/components/_modals.scss
View File

@ -110,7 +110,7 @@
}
.confirm-modal-text2 {
font-size: $font-size-root;
font-size: $font-size-base;
padding-top: $spacer;
}

2
public/sass/components/_slate_editor.scss
View File

@ -1,5 +1,5 @@
.slate-query-field {
font-size: $font-size-root;
font-size: $font-size-base;
font-family: $font-family-monospace;
height: auto;
word-break: break-word;