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

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-04-05 11:34:24 +02:00 committed by GitHub
parent 6d3b6f3c2f
commit 35e68b868e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
View File

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

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

@ -190,7 +190,9 @@ $side-menu-width: 60px;
// dashboard
$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-padding: 10px 15px 9px;

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

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

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

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