From 1ad0c7678a6e1cc1cc2a12e7db17b207d33051ea Mon Sep 17 00:00:00 2001 From: ijin08 Date: Mon, 11 Mar 2019 14:47:27 +0100 Subject: [PATCH] removed -margin, replaced with new general variables --- .../src/themes/_variables.scss.tmpl.ts | 3 +-- public/sass/_variables.generated.scss | 3 +-- public/sass/components/_alerts.scss | 2 +- public/sass/components/_page_loader.scss | 2 +- public/sass/components/_panel_editor.scss | 4 ++-- public/sass/components/_panel_logs.scss | 2 +- public/sass/components/_submenu.scss | 2 +- public/sass/pages/_explore.scss | 24 ++++++++----------- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts index 531f06e1153..11b76f1790c 100644 --- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts @@ -212,8 +212,7 @@ $btn-semi-transparent: rgba(0, 0, 0, 0.2) !default; $side-menu-width: 60px; // dashboard -$panel-margin: 10px; -$dashboard-padding: $panel-margin * 2; +$dashboard-padding: 20 * 2; $panel-horizontal-padding: 10; $panel-vertical-padding: 5; $panel-padding: 0px $panel-horizontal-padding + 0px $panel-vertical-padding + 0px $panel-horizontal-padding + 0px; diff --git a/public/sass/_variables.generated.scss b/public/sass/_variables.generated.scss index ca563e6dd97..f28eb4e4f31 100644 --- a/public/sass/_variables.generated.scss +++ b/public/sass/_variables.generated.scss @@ -215,8 +215,7 @@ $btn-semi-transparent: rgba(0, 0, 0, 0.2) !default; $side-menu-width: 60px; // dashboard -$panel-margin: 10px; -$dashboard-padding: $panel-margin * 2; +$dashboard-padding: 20 * 2; $panel-horizontal-padding: 10; $panel-vertical-padding: 5; $panel-padding: 0px $panel-horizontal-padding + 0px $panel-vertical-padding + 0px $panel-horizontal-padding + 0px; diff --git a/public/sass/components/_alerts.scss b/public/sass/components/_alerts.scss index 1c4f1b7fcb7..da3ebf7fa7b 100644 --- a/public/sass/components/_alerts.scss +++ b/public/sass/components/_alerts.scss @@ -7,7 +7,7 @@ .alert { padding: 15px 20px; - margin-bottom: $panel-margin / 2; + margin-bottom: $space-xs; text-shadow: 0 2px 0 rgba(255, 255, 255, 0.5); background: $alert-error-bg; position: relative; diff --git a/public/sass/components/_page_loader.scss b/public/sass/components/_page_loader.scss index 053a061600f..6fb5ea8ffb2 100644 --- a/public/sass/components/_page_loader.scss +++ b/public/sass/components/_page_loader.scss @@ -7,7 +7,7 @@ &__spinner { font-size: 32px; - margin-bottom: $panel-margin; + margin-bottom: $space-s; } &__text { diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss index 9bd5672e4a8..81d6e4e9e17 100644 --- a/public/sass/components/_panel_editor.scss +++ b/public/sass/components/_panel_editor.scss @@ -21,7 +21,7 @@ } .panel-editor-container__editor { - margin-top: $panel-margin * 2; + margin-top: $space-l; display: flex; flex-direction: row; flex: 1 1 0; @@ -80,7 +80,7 @@ } .submenu-controls { - padding: 0 $dashboard-padding $panel-margin $dashboard-padding; + padding: 0 $dashboard-padding $space-s $dashboard-padding; } .panel-editor-container__panel { diff --git a/public/sass/components/_panel_logs.scss b/public/sass/components/_panel_logs.scss index 5ecfa7259b1..edb72b829e2 100644 --- a/public/sass/components/_panel_logs.scss +++ b/public/sass/components/_panel_logs.scss @@ -6,7 +6,7 @@ $column-horizontal-spacing: 10px; padding: $panel-padding; padding-top: 10px; border-radius: $border-radius; - margin: 2 * $panel-margin 0 $panel-margin; + margin: $space-m 0 $space-s; border: $panel-border; flex-direction: column; } diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss index 6c450f7e6dd..a70b1e46676 100644 --- a/public/sass/components/_submenu.scss +++ b/public/sass/components/_submenu.scss @@ -4,7 +4,7 @@ flex-wrap: wrap; align-content: flex-start; align-items: flex-start; - padding: 0 0 $panel-margin 0; + padding: 0 0 $space-s 0; } .annotation-disabled, diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss index 90579ff67ad..a68d7f1dcb6 100644 --- a/public/sass/pages/_explore.scss +++ b/public/sass/pages/_explore.scss @@ -73,7 +73,7 @@ min-height: 55px; line-height: 55px; justify-content: space-between; - margin-left: $panel-margin * 3; + margin-left: $space-xl; } .explore-toolbar-header { @@ -197,7 +197,7 @@ } .explore-panel { - margin-top: $panel-margin; + margin-top: $space-s; } .explore-panel__body { @@ -216,24 +216,20 @@ .explore-panel__header-label { font-weight: 500; - margin-right: $panel-margin; + margin-right: $space-s; font-size: $font-size-h6; box-shadow: $text-shadow-faint; } .explore-panel__header-buttons { - margin-right: $panel-margin; + margin-right: $space-s; font-size: $font-size-lg; line-height: $font-size-h6; } -.result-options { - margin: 2 * $panel-margin 0; -} - .time-series-disclaimer { width: 300px; - margin: $panel-margin auto; + margin: $space-s auto; padding: 10px 0; border-radius: $border-radius; text-align: center; @@ -241,7 +237,7 @@ .disclaimer-icon { color: $yellow; - margin-right: $panel-margin/2; + margin-right: $space-xs; } .show-all-time-series { @@ -268,7 +264,7 @@ position: relative; overflow: hidden; background: none; - margin: $panel-margin / 2; + margin: $space-xs; } .explore-panel__loader--active:after { @@ -411,7 +407,7 @@ .ReactTable .-pagination { border-top: none; box-shadow: none; - margin-top: $panel-margin; + margin-top: $space-s; } .ReactTable .-pagination .-btn { color: $blue; @@ -452,7 +448,7 @@ // TODO Experimental .cheat-sheet-item { - margin: 2 * $panel-margin 0; + margin: $space-l 0; width: 50%; } @@ -461,6 +457,6 @@ } .cheat-sheet-item__expression { - margin: $panel-margin/2 0; + margin: $space-xs 0; cursor: pointer; }