From 09dbd6b1a6dd8b2866b289ca592c76e2da3c0078 Mon Sep 17 00:00:00 2001
From: ijin08 <ocarroll.patrick@gmail.com>
Date: Wed, 13 Feb 2019 11:04:22 +0100
Subject: [PATCH] removed _plugins.scss and _settings_permissions.scc, removed
 unused classes in _login.scss, reduced dark variabels in light theme and
 alignied light theme a bit with dark theme, turned blue-gray, dark-3 and
 panel-bg variables into one variable and removed gray-7 in dark theme

---
 public/sass/_grafana.scss                     |  2 -
 public/sass/_variables.dark.scss              | 43 +++++-------
 public/sass/_variables.light.scss             | 69 +++++++++----------
 public/sass/base/_reboot.scss                 |  2 +-
 public/sass/base/_type.scss                   |  2 +-
 .../components/_settings_permissions.scss     | 32 ---------
 public/sass/pages/_login.scss                 | 35 ----------
 public/sass/pages/_plugins.scss               | 31 ---------
 8 files changed, 53 insertions(+), 163 deletions(-)
 delete mode 100644 public/sass/components/_settings_permissions.scss
 delete mode 100644 public/sass/pages/_plugins.scss

diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 739ccb6c412..3170de5ba1a 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -60,7 +60,6 @@
 @import 'components/panel_text';
 @import 'components/panel_heatmap';
 @import 'components/panel_logs';
-@import 'components/settings_permissions';
 @import 'components/tagsinput';
 @import 'components/tables_lists';
 @import 'components/search';
@@ -110,7 +109,6 @@
 @import 'pages/admin';
 @import 'pages/alerting';
 @import 'pages/history';
-@import 'pages/plugins';
 @import 'pages/signup';
 @import 'pages/styleguide';
 @import 'pages/errorpage';
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 6181590985f..8c729f0d1e8 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -6,24 +6,23 @@ $theme-name: dark;
 // New Colors
 // -------------------------
 $sapphire-faint: #041126;
-$sapphire-light: #5794F2;
-$sapphire-base: #3274D9;
-$sapphire-shade: #1F60C4;
-$lobster-base: #E02F44;
-$lobster-shade: #C4162A;
-$forest-light: #96D98D;
-$forest-base: #37872D;
-$forest-shade: #19730E;
-$green-base: #299C46;
-$green-shade: #23843B;
-
+$sapphire-light: #5794f2;
+$sapphire-base: #3274d9;
+$sapphire-shade: #1f60c4;
+$lobster-base: #e02f44;
+$lobster-shade: #c4162a;
+$forest-light: #96d98d;
+$forest-base: #37872d;
+$forest-shade: #19730e;
+$green-base: #299c46;
+$green-shade: #23843b;
 
 // Grays
 // -------------------------
 $black: #000;
 $dark-1: #141414;
 $dark-2: #1f1f20;
-$dark-3: #262628;
+$dark-3: #222426;
 $dark-4: #333333;
 $dark-5: #444444;
 $gray-1: #555555;
@@ -31,9 +30,7 @@ $gray-2: #8e8e8e;
 $gray-3: #b3b3b3;
 $gray-4: #d8d9da;
 $gray-5: #ececec;
-$gray-7: #fbfbfb;
 
-$gray-blue: #212327;
 $input-black: #09090b;
 
 $white: #fff;
@@ -101,14 +98,14 @@ $external-link-color: $sapphire-light;
 // Typography
 // -------------------------
 $headings-color: darken($white, 11%);
-$abbr-border-color: $gray-3 !default;
+$abbr-border-color: $gray-2 !default;
 $text-muted: $text-color-weak;
 
 $hr-border-color: $dark-4;
 
 // Panel
 // -------------------------
-$panel-bg: #212124;
+$panel-bg: $dark-3;
 $panel-border: solid 1px $dark-1;
 $panel-header-hover-bg: $dark-4;
 $panel-corner: $panel-bg;
@@ -121,7 +118,6 @@ $page-header-border-color: $dark-4;
 $divider-border-color: $gray-1;
 
 // Graphite Target Editor
-$tight-form-bg: $dark-3;
 $tight-form-func-bg: $dark-4;
 $tight-form-func-highlight-bg: $dark-5;
 
@@ -136,11 +132,11 @@ $card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, 0.1), 1px 1px 0 0 rgba(0, 0, 0, 0.
 
 // Lists
 $list-item-bg: $card-background;
-$list-item-hover-bg: lighten($gray-blue, 2%);
+$list-item-hover-bg: lighten($dark-3, 2%);
 $list-item-link-color: $text-color;
 $list-item-shadow: $card-shadow;
 
-$empty-list-cta-bg: $gray-blue;
+$empty-list-cta-bg: $dark-3;
 
 // Scrollbars
 $scrollbarBackground: #404357;
@@ -149,7 +145,6 @@ $scrollbarBorder: black;
 
 // Tables
 // -------------------------
-$table-bg: transparent; // overall background-color
 $table-bg-accent: $dark-3; // for striping
 $table-border: $dark-3; // table and cell border
 
@@ -196,7 +191,7 @@ $input-box-shadow: inset 1px 0px 0.3rem 0px rgba(150, 150, 150, 0.1);
 $input-border-focus: $input-border-color;
 $input-box-shadow-focus: rgba(102, 175, 233, 0.6);
 $input-color-placeholder: $gray-1 !default;
-$input-label-bg: $gray-blue;
+$input-label-bg: $dark-3;
 $input-label-border-color: $dark-3;
 $input-color-select-arrow: $white;
 
@@ -205,7 +200,7 @@ $placeholderText: darken($text-color, 25%);
 
 // Search
 $search-shadow: 0 0 30px 0 $black;
-$search-filter-box-bg: $gray-blue;
+$search-filter-box-bg: $dark-3;
 
 // Typeahead
 $typeahead-shadow: 0 5px 10px 0 $black;
@@ -343,7 +338,7 @@ $diff-json-new: #457740;
 $diff-json-changed-fg: $gray-5;
 $diff-json-changed-num: $text-color;
 
-$diff-json-icon: $gray-7;
+$diff-json-icon: $gray-5;
 
 //Submenu
 $variable-option-bg: $dropdownLinkBackgroundHover;
@@ -377,7 +372,7 @@ $panel-editor-tabs-line-color: #e3e3e3;
 $panel-editor-viz-item-bg-hover: darken($sapphire-base, 46%);
 
 $panel-options-group-border: none;
-$panel-options-group-header-bg: $gray-blue;
+$panel-options-group-header-bg: $dark-3;
 
 $panel-grid-placeholder-bg: $sapphire-faint;
 $panel-grid-placeholder-shadow: 0 0 4px $sapphire-shade;
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index f0e0a535653..e5d67f092ee 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -5,25 +5,23 @@ $theme-name: light;
 
 // New Colors
 // -------------------------
-$sapphire-faint: #F5F9FF;
-$sapphire-light: #A8CAFF;
-$sapphire-base: #3274D9;
-$sapphire-shade: #1F60C4;
-$lobster-base: #E02F44;
-$lobster-shade: #C4162A;
-$green-base: #37872D;
-$green-shade: #19730E;
-$green-base: #3EB15B;
-$green-shade: #369B4F;
-$purple-shade: #8F3BB8;
-$yellow-base: #F2CC0C;
+$sapphire-faint: #f5f9ff;
+$sapphire-light: #a8caff;
+$sapphire-base: #3274d9;
+$sapphire-shade: #1f60c4;
+$lobster-base: #e02f44;
+$lobster-shade: #c4162a;
+$green-base: #37872d;
+$green-shade: #19730e;
+$green-base: #3eb15b;
+$green-shade: #369b4f;
+$purple-shade: #8f3bb8;
+$yellow-base: #f2cc0c;
 
 // Grays
 // -------------------------
 $black: #000;
 $dark-2: #1e2028;
-$dark-3: #303133;
-$dark-4: #35373f;
 $dark-5: #41444b;
 $gray-1: #52545c;
 $gray-2: #767980;
@@ -78,12 +76,7 @@ $text-color-emphasis: $dark-5;
 $text-shadow-faint: none;
 
 // gradients
-$brand-gradient: linear-gradient(
-  to right,
-  rgba(255, 213, 0, 1) 0%,
-  rgba(255, 68, 0, 1) 99%,
-  rgba(255, 68, 0, 1) 100%
-);
+$brand-gradient: linear-gradient(to right, rgba(255, 213, 0, 1) 0%, rgba(255, 68, 0, 1) 99%, rgba(255, 68, 0, 1) 100%);
 
 $page-gradient: linear-gradient(180deg, $white 10px, $gray-7 100px);
 $edit-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);
@@ -101,7 +94,7 @@ $headings-color: $text-color;
 $abbr-border-color: $gray-2 !default;
 $text-muted: $text-color-weak;
 
-$hr-border-color: $dark-3 !default;
+$hr-border-color: $gray-4 !default;
 
 // Panel
 // -------------------------
@@ -118,13 +111,12 @@ $page-header-border-color: $gray-4;
 $divider-border-color: $gray-2;
 
 // Graphite Target Editor
-$tight-form-bg: #eaebee;
 $tight-form-func-bg: $gray-5;
 $tight-form-func-highlight-bg: $gray-6;
 
 $modal-backdrop-bg: $body-bg;
 $code-tag-bg: $gray-6;
-$code-tag-border: darken($code-tag-bg, 3%);
+$code-tag-border: $gray-4;
 
 // cards
 $card-background: linear-gradient(135deg, $gray-6, $gray-5);
@@ -146,7 +138,6 @@ $scrollbarBorder: $gray-4;
 
 // Tables
 // -------------------------
-$table-bg: transparent; // overall background-color
 $table-bg-accent: $gray-5; // for striping
 $table-border: $gray-3; // table and cell border
 
@@ -167,8 +158,9 @@ $btn-success-bg-hl: $green-shade;
 $btn-danger-bg: $lobster-base;
 $btn-danger-bg-hl: $lobster-shade;
 
-$btn-inverse-bg: $gray-6;
-$btn-inverse-bg-hl: darken($gray-6, 5%);
+$btn-inverse-bg: $gray-5;
+$btn-inverse-bg-hl: darken($gray-5, 5%);
+$btn-inverse-bg-hl: $gray-4;
 $btn-inverse-text-color: $gray-1;
 $btn-inverse-text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
 
@@ -186,7 +178,7 @@ $btn-drag-image: '../img/grab_light.svg';
 $input-bg: $white;
 $input-bg-disabled: $gray-5;
 
-$input-color: $dark-3;
+$input-color: $dark-5;
 $input-border-color: $gray-5;
 $input-box-shadow: none;
 $input-border-focus: $sapphire-light !default;
@@ -215,7 +207,7 @@ $dropdownBorder: $gray-4;
 $dropdownDividerTop: $gray-6;
 $dropdownDividerBottom: $white;
 
-$dropdownLinkColor: $dark-3;
+$dropdownLinkColor: $dark-5;
 $dropdownLinkColorHover: $link-color;
 $dropdownLinkColorActive: $link-color;
 
@@ -230,7 +222,7 @@ $horizontalComponentOffset: 180px;
 $navbarHeight: 52px;
 
 $navbarBackground: $white;
-$navbarBorder: 1px solid $gray-4;
+$navbarBorder: 1px solid $gray-5;
 $navbarShadow: 0 0 3px #c1c1c1;
 
 $navbarLinkColor: #444;
@@ -270,7 +262,7 @@ $success-text-color: lighten($green, 10%);
 $alert-error-bg: linear-gradient(90deg, $lobster-base, $lobster-shade);
 $alert-success-bg: linear-gradient(90deg, $green-base, $green-shade);
 $alert-warning-bg: linear-gradient(90deg, $lobster-base, $lobster-shade);
-$alert-info-bg: $sapphire-base;
+$alert-info-bg: linear-gradient(100deg, $sapphire-base, $sapphire-shade);
 
 // popover
 $popover-bg: $page-bg;
@@ -278,7 +270,7 @@ $popover-color: $text-color;
 $popover-border-color: $gray-5;
 $popover-shadow: 0 0 20px $white;
 
-$popover-help-bg: $sapphire-base;
+$popover-help-bg: $btn-secondary-bg;
 $popover-help-color: $gray-6;
 
 $popover-error-bg: $btn-danger-bg;
@@ -324,10 +316,10 @@ $json-explorer-url-color: $sapphire-base;
 $diff-label-bg: $gray-5;
 $diff-label-fg: $gray-2;
 
-$diff-arrow-color: $dark-3;
-$diff-group-bg: $gray-7;
+$diff-arrow-color: $dark-5;
+$diff-group-bg: $gray-6;
 
-$diff-json-bg: $gray-5;
+$diff-json-bg: $gray-6;
 $diff-json-fg: $gray-1;
 
 $diff-json-added: $sapphire-shade;
@@ -349,14 +341,14 @@ $variable-option-bg: $dropdownLinkBackgroundHover;
 $switch-bg: $white;
 $switch-slider-color: $gray-7;
 $switch-slider-off-bg: $gray-5;
-$switch-slider-on-bg: linear-gradient(90deg, #FF9830, #E55400);
+$switch-slider-on-bg: linear-gradient(90deg, #ff9830, #e55400);
 $switch-slider-shadow: 0 0 3px $dark-5;
 
 //Checkbox
 // -------------------------
 $checkbox-bg: $gray-6;
 $checkbox-border: 1px solid $gray-3;
-$checkbox-checked-bg: linear-gradient(0deg, #FF9830, #E55400);
+$checkbox-checked-bg: linear-gradient(0deg, #ff9830, #e55400);
 $checkbox-color: $gray-7;
 
 //Panel Edit
@@ -369,7 +361,10 @@ $panel-editor-viz-item-shadow-hover: 0 0 4px $blue-light;
 $panel-editor-viz-item-border-hover: 1px solid $blue-light;
 $panel-editor-viz-item-bg: $white;
 $panel-editor-tabs-line-color: $dark-5;
-$panel-editor-viz-item-bg-hover: lighten($blue, 62%);$panel-options-group-border: none;
+
+$panel-editor-viz-item-bg-hover: lighten($blue, 62%);
+
+$panel-options-group-border: none;
 $panel-options-group-header-bg: $gray-5;
 
 $panel-grid-placeholder-bg: $sapphire-faint;
diff --git a/public/sass/base/_reboot.scss b/public/sass/base/_reboot.scss
index 8aac8bc815e..65cfafc107d 100644
--- a/public/sass/base/_reboot.scss
+++ b/public/sass/base/_reboot.scss
@@ -246,7 +246,7 @@ textarea {
 
 table {
   // Reset for nesting within parents with `background-color`.
-  background-color: $table-bg;
+  background-color: transparent;
 }
 
 caption {
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index 9919a370a87..82aae6351af 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -266,7 +266,7 @@ dd {
 // Abbreviations and acronyms
 abbr[title] {
   cursor: help;
-  border-bottom: 1px dotted $gray-2;
+  border-bottom: 1px dotted $abbr-border-color;
 }
 
 abbr.initialism {
diff --git a/public/sass/components/_settings_permissions.scss b/public/sass/components/_settings_permissions.scss
deleted file mode 100644
index 5864c58679e..00000000000
--- a/public/sass/components/_settings_permissions.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-.permissionlist {
-  .permissionlist__section {
-    margin-bottom: $spacer*2;
-  }
-
-  .permissionlist__section-header {
-    margin-bottom: $spacer;
-    display: flex;
-  }
-
-  .permissionlist__section-header h6 {
-    margin: auto 5px;
-    color: $text-color-weak;
-  }
-
-  .permissionlist__section-header__add-button {
-    margin-left: auto;
-    width: 105px;
-  }
-
-  .permissionlist__item {
-    background-color: $tight-form-bg;
-
-    &:hover {
-      background-color: $tight-form-func-bg;
-    }
-  }
-
-  .permissionlist__item-buttons {
-    margin-left: auto;
-  }
-}
diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss
index 091391da7ff..c42fd47ba1c 100644
--- a/public/sass/pages/_login.scss
+++ b/public/sass/pages/_login.scss
@@ -176,12 +176,6 @@ select:-webkit-autofill:focus {
   }
 }
 
-.login-tab-header {
-  background: $tight-form-bg;
-  text-align: center;
-  margin-bottom: 3rem;
-}
-
 .login-change-password-info {
   padding-bottom: 1.5rem;
 
@@ -195,26 +189,6 @@ select:-webkit-autofill:focus {
   background-color: $btn-semi-transparent;
 }
 
-.btn-login-tab {
-  background: transparent;
-  border: none;
-  font-size: 15px;
-  padding: 10px 10px;
-  font-weight: bold;
-  display: inline-block;
-  width: 170px;
-  color: $text-color;
-
-  &.active {
-    background: darken($tight-form-bg, 5%);
-    color: $white;
-  }
-
-  &:focus {
-    outline: 0;
-  }
-}
-
 .password-strength {
   display: block;
   width: 15%;
@@ -252,15 +226,6 @@ select:-webkit-autofill:focus {
   width: 100%;
 }
 
-.password-recovery {
-  background: $tight-form-bg;
-  padding: 10px;
-
-  a {
-    color: $gray-2;
-  }
-}
-
 .login-divider {
   float: left;
   width: 100%;
diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
deleted file mode 100644
index 2570eb6c791..00000000000
--- a/public/sass/pages/_plugins.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.get-more-plugins-link {
-  color: $gray-3;
-  font-size: $font-size-sm;
-  position: relative;
-  top: 1.2rem;
-
-  &:hover {
-    color: $link-hover-color;
-  }
-
-  img {
-    vertical-align: top;
-  }
-}
-
-@include media-breakpoint-down(sm) {
-  .get-more-plugins-link {
-    display: none;
-  }
-}
-
-.plugin-info-list-item {
-  white-space: nowrap;
-  max-width: $page-sidebar-width;
-  text-overflow: ellipsis;
-  overflow: hidden;
-
-  img {
-    width: 16px;
-  }
-}