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

packages/grafana-data/src/types/theme.ts

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

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

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

packages/grafana-ui/src/themes/default.ts

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

public/sass/_variables.generated.scss

@@ -102,8 +102,7 @@ $height-lg: 48px;
 $font-family-sans-serif: 'Roboto', 'Helvetica Neue', Arial, sans-serif;
 $font-family-sans-serif: 'Roboto', 'Helvetica Neue', Arial, sans-serif;
 $font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace;
 $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-lg: 18px !default;
 $font-size-md: 14px !default;
 $font-size-md: 14px !default;

public/sass/base/_reboot.scss

@@ -55,7 +55,7 @@ html {
 
 
 html {
 html {
   // Sets a specific default `font-size` for user with `rem` type scales.
   // 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,
   // 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.
   // 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,
   // Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive,
@@ -69,7 +69,6 @@ html {
 }
 }
 
 
 body {
 body {
-  // Make the `body` use the `font-size-root`
   font-family: $font-family-sans-serif;
   font-family: $font-family-sans-serif;
   font-size: $font-size-base;
   font-size: $font-size-base;
   line-height: $line-height-base;
   line-height: $line-height-base;

public/sass/components/_modals.scss

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

public/sass/components/_slate_editor.scss

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