From 8d03db24748a99b2a406ade7af867b31d3c9aa97 Mon Sep 17 00:00:00 2001 From: ijin08 Date: Thu, 21 Mar 2019 12:15:13 +0100 Subject: [PATCH] reversed dashboard-padding --- packages/grafana-ui/src/themes/_variables.scss.tmpl.ts | 2 +- public/sass/components/_panel_editor.scss | 8 ++++---- public/sass/pages/_dashboard.scss | 2 +- public/sass/pages/_explore.scss | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts index 0c6ff640fe4..23e63655f21 100644 --- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts @@ -196,7 +196,7 @@ $btn-semi-transparent: rgba(0, 0, 0, 0.2) !default; $side-menu-width: 60px; // dashboard -$dashboard-padding: $space-md $space-md 0 $space-md; +$dashboard-padding: $space-md; $panel-padding: 0 $space-md $space-sm $space-md; // tabs diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss index 6df1cc60f60..a50ab0d072d 100644 --- a/public/sass/components/_panel_editor.scss +++ b/public/sass/components/_panel_editor.scss @@ -9,14 +9,14 @@ &--edit { height: 40%; - margin: 0 $space-md; + margin: 0 $dashboard-padding; } &--view { flex: 1 1 0; height: 90%; - margin: 0 $space-md; - padding-top: $space-md; + margin: 0 $dashboard-padding; + padding-top: $dashboard-padding; } } @@ -80,7 +80,7 @@ } .submenu-controls { - padding: 0 $space-md $space-sm $space-md; + padding: 0 $dashboard-padding $space-sm $dashboard-padding; } .search-container { diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index 42a5988efb4..df3a34e1d06 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -1,5 +1,5 @@ .dashboard-container { - padding: $dashboard-padding; + padding: $dashboard-padding $dashboard-padding 0 $dashboard-padding; width: 100%; height: 100%; box-sizing: border-box; diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss index 666c5e4327c..0b26417005b 100644 --- a/public/sass/pages/_explore.scss +++ b/public/sass/pages/_explore.scss @@ -31,7 +31,7 @@ flex-flow: row wrap; justify-content: flex-start; height: auto; - padding: 0 $space-md; + padding: 0 $dashboard-padding; border-bottom: 1px solid #0000; transition-duration: 0.35s; transition-timing-function: ease-in-out; @@ -91,7 +91,7 @@ } .explore-toolbar-content-item:first-child { - padding-left: $space-md; + padding-left: $dashboard-spacer; margin-right: auto; } @@ -142,7 +142,7 @@ @media only screen and (max-width: 544px) { .explore-toolbar-header-title { .navbar-page-btn { - margin-left: $space-md; + margin-left: $dashboard-padding; } } }