public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 35e68b868e)
This commit is contained in:
Torkel Ödegaard
2019-04-05 11:37:24 +02:00
parent 9d452256bf
commit 638d49dd6e
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
+4 -4
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",
@@ -335,8 +335,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",
packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
+3 -1
View File
@@ -197,7 +197,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;
packages/grafana-ui/src/themes/default.ts
+2 -2
View File
@@ -67,8 +67,8 @@ const theme: GrafanaThemeCommons = {
},
},
panelPadding: {
horizontal: 10,
vertical: 5,
horizontal: 16,
vertical: 8,
},
zIndex: {
dropdown: '1000',
public/sass/_variables.generated.scss
+1 -1
View File
@@ -200,7 +200,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;