Fix: align panel padding between sass & js theme (#16404)

pull/16397/head^2
Torkel Ödegaard 7 years ago committed by GitHub
parent 6d3b6f3c2f
commit 35e68b868e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
  2. 4
      packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
  3. 4
      packages/grafana-ui/src/themes/default.ts
  4. 2
      public/sass/_variables.generated.scss

@ -178,8 +178,8 @@ exports[`Render should render with base threshold 1`] = `
}, },
"name": "Grafana Dark", "name": "Grafana Dark",
"panelPadding": Object { "panelPadding": Object {
"horizontal": 10, "horizontal": 16,
"vertical": 5, "vertical": 8,
}, },
"spacing": Object { "spacing": Object {
"d": "14px", "d": "14px",
@ -336,8 +336,8 @@ exports[`Render should render with base threshold 1`] = `
}, },
"name": "Grafana Dark", "name": "Grafana Dark",
"panelPadding": Object { "panelPadding": Object {
"horizontal": 10, "horizontal": 16,
"vertical": 5, "vertical": 8,
}, },
"spacing": Object { "spacing": Object {
"d": "14px", "d": "14px",

@ -190,7 +190,9 @@ $side-menu-width: 60px;
// dashboard // dashboard
$dashboard-padding: $space-md; $dashboard-padding: $space-md;
$panel-padding: 0 $space-md $space-sm $space-md; $panel-padding: 0 ${theme.panelPadding.horizontal}px ${theme.panelPadding.vertical}px ${
theme.panelPadding.horizontal
}px;
// tabs // tabs
$tabs-padding: 10px 15px 9px; $tabs-padding: 10px 15px 9px;

@ -68,8 +68,8 @@ const theme: GrafanaThemeCommons = {
}, },
}, },
panelPadding: { panelPadding: {
horizontal: 10, horizontal: 16,
vertical: 5, vertical: 8,
}, },
zIndex: { zIndex: {
dropdown: '1000', dropdown: '1000',

@ -193,7 +193,7 @@ $side-menu-width: 60px;
// dashboard // dashboard
$dashboard-padding: $space-md; $dashboard-padding: $space-md;
$panel-padding: 0 $space-md $space-sm $space-md; $panel-padding: 0 16px 8px 16px;
// tabs // tabs
$tabs-padding: 10px 15px 9px; $tabs-padding: 10px 15px 9px;

Loading…
Cancel
Save