Skip to content

Commit 4f318dd

Browse files
authored
Merge branch 'fluxninja_micro_frontends' into add-fn-loader
2 parents 55faec5 + 58a3b05 commit 4f318dd

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

packages/grafana-ui/src/themes/GlobalStyles/elements.ts

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export function getElementStyles(theme: GrafanaTheme2) {
1010
-ms-overflow-style: scrollbar;
1111
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
1212
height: 100%;
13-
font-size: ${theme.typography.htmlFontSize}px;
1413
font-family: ${theme.typography.fontFamily};
1514
line-height: ${theme.typography.body.lineHeight};
1615
font-kerning: normal;

public/sass/base/_reboot.scss

-2
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,12 @@ html {
6464

6565
// This is specified in runtime Emotion GlobalStyles but we need them for the Grafana loading styles
6666
html {
67-
font-size: $font-size-base;
6867
height: 100%;
6968
}
7069

7170
// This is specified in runtime Emotion GlobalStyles but we need them for the Grafana loading styles
7271
body {
7372
font-family: $font-family-sans-serif;
74-
font-size: $font-size-base;
7573
line-height: $line-height-base;
7674
color: $text-color;
7775
background-color: $body-bg;

0 commit comments

Comments
 (0)