Skip to content

N
nexpie-grafana-theme
Commit 1eb804c6 by Torkel Ödegaard Committed by GitHub
Options

Merge pull request #15411 from grafana/theme-files-cleanup 

[wip]Cleaning up the theme .scss files
parents 9d78960c e5562305
Showing with 89 additions and 198 deletions
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';
......
public/sass/_variables.dark.scss
......@@ -12,28 +12,31 @@ $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-4: #333333;
$dark-5: #444444;
$dark-2: #161719;
$dark-3: #1f1f20;
$dark-4: #212124;
$dark-5: #222426;
$dark-6: #262628;
$dark-7: #292a2d;
$dark-8: #2f2f32;
$dark-9: #343436;
$dark-10: #424345;
$gray-1: #555555;
$gray-2: #8e8e8e;
$gray-3: #b3b3b3;
$gray-4: #d8d9da;
$gray-5: #ececec;
$gray-7: #fbfbfb;
$gray-blue: #212327;
$input-black: #09090b;
$gray-blue: #212327;
$white: #fff;
......@@ -66,14 +69,14 @@ $critical: $lobster-base;
// Scaffolding
// -------------------------
$body-bg: rgb(23, 24, 25);
$page-bg: rgb(22, 23, 25);
$body-bg: $dark-2;
$page-bg: $dark-2;
$body-color: $gray-4;
$text-color: $gray-4;
$text-color-strong: $white;
$text-color-weak: $gray-2;
$text-color-faint: $dark-5;
$text-color-faint: $dark-10;
$text-color-emphasis: $gray-5;
$text-shadow-faint: 1px 1px 4px rgb(45, 45, 45);
......@@ -87,8 +90,8 @@ $brand-gradient: linear-gradient(
rgba(255, 68, 0, 0.7) 100%
);
$page-gradient: linear-gradient(180deg, #222426 10px, rgb(22, 23, 25) 100px);
$edit-gradient: linear-gradient(180deg, rgb(22, 23, 25) 50%, #090909);
$page-gradient: linear-gradient(180deg, $dark-5 10px, dark-2 100px);
$edit-gradient: linear-gradient(180deg, $dark-2 50%, $input-black);
// Links
// -------------------------
......@@ -100,60 +103,58 @@ $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;
$hr-border-color: $dark-9;
// Panel
// -------------------------
$panel-bg: #212124;
$panel-bg: $dark-4;
$panel-border: solid 1px $dark-1;
$panel-header-hover-bg: $dark-4;
$panel-header-hover-bg: $dark-9;
$panel-corner: $panel-bg;
// page header
$page-header-bg: linear-gradient(90deg, #292a2d, black);
$page-header-shadow: inset 0px -4px 14px $dark-2;
$page-header-border-color: $dark-4;
$page-header-bg: linear-gradient(90deg, $dark-7, $black);
$page-header-shadow: inset 0px -4px 14px $dark-3;
$page-header-border-color: $dark-9;
$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;
$tight-form-func-bg: $dark-9;
$tight-form-func-highlight-bg: $dark-10;
$modal-backdrop-bg: #353c42;
$code-tag-bg: $dark-1;
$code-tag-border: $dark-4;
$code-tag-border: $dark-9;
// cards
$card-background: linear-gradient(135deg, #2f2f32, #262628);
$card-background-hover: linear-gradient(135deg, #343436, #262628);
$card-background: linear-gradient(135deg, $dark-8, $dark-6);
$card-background-hover: linear-gradient(135deg, $dark-9, $dark-6);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, 0.1), 1px 1px 0 0 rgba(0, 0, 0, 0.3);
// Lists
$list-item-bg: $card-background;
$list-item-hover-bg: lighten($gray-blue, 2%);
$list-item-hover-bg: $card-background-hover;
$list-item-link-color: $text-color;
$list-item-shadow: $card-shadow;
$empty-list-cta-bg: $gray-blue;
// Scrollbars
$scrollbarBackground: #404357;
$scrollbarBackground2: #3a3a3a;
$scrollbarBorder: black;
$scrollbarBackground: $dark-9;
$scrollbarBackground2: $dark-9;
$scrollbarBorder: $dark-10;
// Tables
// -------------------------
$table-bg: transparent; // overall background-color
$table-bg-accent: $dark-3; // for striping
$table-border: $dark-3; // table and cell border
$table-bg-accent: $dark-6; // for striping
$table-border: $dark-6; // table and cell border
$table-bg-odd: $dark-2;
$table-bg-hover: $dark-3;
$table-bg-odd: $dark-3;
$table-bg-hover: $dark-6;
// Buttons
// -------------------------
......@@ -170,8 +171,8 @@ $btn-success-bg-hl: $green-shade;
$btn-danger-bg: $lobster-base;
$btn-danger-bg-hl: $lobster-shade;
$btn-inverse-bg: $dark-3;
$btn-inverse-bg-hl: lighten($dark-3, 4%);
$btn-inverse-bg: $dark-6;
$btn-inverse-bg-hl: lighten($dark-6, 4%);
$btn-inverse-text-color: $link-color;
$btn-inverse-text-shadow: 0px 1px 0 rgba(0, 0, 0, 0.1);
......@@ -179,24 +180,24 @@ $btn-link-color: $gray-3;
$iconContainerBackground: $black;
$btn-divider-left: $dark-4;
$btn-divider-right: $dark-2;
$btn-divider-left: $dark-9;
$btn-divider-right: $dark-3;
$btn-drag-image: '../img/grab_dark.svg';
// Forms
// -------------------------
$input-bg: $input-black;
$input-bg-disabled: $dark-3;
$input-bg-disabled: $dark-6;
$input-color: $gray-4;
$input-border-color: $dark-3;
$input-border-color: $dark-6;
$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-border-focus: $dark-6 !default;
$input-box-shadow-focus: $sapphire-light !default;
$input-color-placeholder: $gray-1 !default;
$input-label-bg: $gray-blue;
$input-label-border-color: $dark-3;
$input-label-border-color: $dark-6;
$input-color-select-arrow: $white;
// Input placeholder text color
......@@ -208,12 +209,12 @@ $search-filter-box-bg: $gray-blue;
// Typeahead
$typeahead-shadow: 0 5px 10px 0 $black;
$typeahead-selected-bg: $dark-4;
$typeahead-selected-bg: $dark-9;
$typeahead-selected-color: $yellow;
// Dropdowns
// -------------------------
$dropdownBackground: $dark-3;
$dropdownBackground: $dark-6;
$dropdownBorder: rgba(0, 0, 0, 0.2);
$dropdownDividerTop: transparent;
$dropdownDividerBottom: #444;
......@@ -222,7 +223,7 @@ $dropdownLinkColor: $text-color;
$dropdownLinkColorHover: $white;
$dropdownLinkColorActive: $white;
$dropdownLinkBackgroundHover: $dark-4;
$dropdownLinkBackgroundHover: $dark-9;
// Horizontal forms & lists
// -------------------------
......@@ -233,10 +234,7 @@ $horizontalComponentOffset: 180px;
$navbarHeight: 55px;
$navbarBackground: $panel-bg;
$navbarBorder: 1px solid $dark-3;
$navbarShadow: 0 0 20px black;
$navbarLinkColor: $gray-4;
$navbarBorder: 1px solid $dark-6;
$navbarButtonBackground: $navbarBackground;
$navbarButtonBackgroundHighlight: $body-bg;
......@@ -247,19 +245,19 @@ $navbar-button-border: #2f2f32;
// -------------------------
$side-menu-bg: $black;
$side-menu-bg-mobile: $side-menu-bg;
$side-menu-item-hover-bg: $dark-2;
$side-menu-item-hover-bg: $dark-3;
$side-menu-shadow: 0 0 20px black;
$side-menu-link-color: $link-color;
// Menu dropdowns
// -------------------------
$menu-dropdown-bg: $body-bg;
$menu-dropdown-hover-bg: $dark-2;
$menu-dropdown-hover-bg: $dark-3;
$menu-dropdown-shadow: 5px 5px 20px -5px $black;
// Tabs
// -------------------------
$tab-border-color: $dark-4;
$tab-border-color: $dark-9;
// Toolbar
$toolbar-bg: $input-black;
......@@ -276,9 +274,9 @@ $alert-warning-bg: linear-gradient(90deg, $lobster-base, $lobster-shade);
$alert-info-bg: linear-gradient(100deg, $sapphire-base, $sapphire-shade);
// popover
$popover-bg: $page-bg;
$popover-bg: $dark-2;
$popover-color: $text-color;
$popover-border-color: $dark-4;
$popover-border-color: $dark-9;
$popover-shadow: 0 0 20px black;
$popover-help-bg: $btn-secondary-bg;
......@@ -324,13 +322,13 @@ $json-explorer-url-color: #027bff;
// Changelog and diff
// -------------------------
$diff-label-bg: $dark-2;
$diff-label-bg: $dark-3;
$diff-label-fg: $white;
$diff-group-bg: $dark-4;
$diff-group-bg: $dark-9;
$diff-arrow-color: $white;
$diff-json-bg: $dark-4;
$diff-json-bg: $dark-9;
$diff-json-fg: $gray-5;
$diff-json-added: $sapphire-shade;
......@@ -342,7 +340,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;
......@@ -350,7 +348,7 @@ $variable-option-bg: $dropdownLinkBackgroundHover;
//Switch Slider
// -------------------------
$switch-bg: $input-bg;
$switch-slider-color: $dark-2;
$switch-slider-color: $dark-3;
$switch-slider-off-bg: $gray-1;
$switch-slider-on-bg: linear-gradient(90deg, #eb7b18, #d44a3a);
$switch-slider-shadow: 0 0 3px black;
......@@ -366,8 +364,8 @@ $checkbox-color: $dark-1;
// -------------------------
$panel-editor-shadow: 0 0 20px black;
$panel-editor-side-menu-shadow: drop-shadow(0 0 10px $black);
$panel-editor-viz-item-shadow: 0 0 8px $dark-5;
$panel-editor-viz-item-border: 1px solid $dark-5;
$panel-editor-viz-item-shadow: 0 0 8px $dark-10;
$panel-editor-viz-item-border: 1px solid $dark-10;
$panel-editor-viz-item-shadow-hover: 0 0 4px $sapphire-light;
$panel-editor-viz-item-border-hover: 1px solid $sapphire-light;
$panel-editor-viz-item-bg: $input-black;
......@@ -387,8 +385,8 @@ $logs-color-unkown: $gray-2;
// toggle-group
$button-toggle-group-btn-active-bg: linear-gradient(90deg, #eb7b18, #d44a3a);
$button-toggle-group-btn-active-shadow: inset 0 0 4px $black;
$button-toggle-group-btn-seperator-border: 1px solid $page-bg;
$button-toggle-group-btn-seperator-border: 1px solid $dark-2;
$vertical-resize-handle-bg: $dark-5;
$vertical-resize-handle-bg: $dark-10;
$vertical-resize-handle-dots: $gray-1;
$vertical-resize-handle-dots-hover: $gray-2;
public/sass/_variables.light.scss
......@@ -6,13 +6,11 @@ $theme-name: light;
// New Colors
// -------------------------
$sapphire-faint: #f5f9ff;
$sapphire-light: #a8caff;
$sapphire-light: #5794f2;
$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;
......@@ -22,8 +20,6 @@ $yellow-base: #f2cc0c;
// -------------------------
$black: #000;
$dark-2: #1e2028;
$dark-3: #303133;
$dark-4: #35373f;
$dark-5: #41444b;
$gray-1: #52545c;
$gray-2: #767980;
......@@ -38,7 +34,6 @@ $white: #fff;
// Accent colors
// -------------------------
$blue: #0083b3;
$blue-light: #00a8e6;
$green: #3aa655;
$red: $lobster-base;
$yellow: #ff851b;
......@@ -96,7 +91,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
// -------------------------
......@@ -113,13 +108,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);
......@@ -135,13 +129,12 @@ $list-item-shadow: $card-shadow;
$empty-list-cta-bg: $gray-6;
// Scrollbars
$scrollbarBackground: $gray-5;
$scrollbarBackground2: $gray-5;
$scrollbarBorder: $gray-4;
$scrollbarBackground: $gray-4;
$scrollbarBackground2: $gray-4;
$scrollbarBorder: $gray-3;
// Tables
// -------------------------
$table-bg: transparent; // overall background-color
$table-bg-accent: $gray-5; // for striping
$table-border: $gray-3; // table and cell border
......@@ -162,8 +155,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);
......@@ -181,10 +175,10 @@ $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;
$input-border-focus: $gray-5 !default;
$input-box-shadow-focus: $sapphire-light !default;
$input-color-placeholder: $gray-4 !default;
$input-label-bg: $gray-5;
......@@ -210,7 +204,7 @@ $dropdownBorder: $gray-4;
$dropdownDividerTop: $gray-6;
$dropdownDividerBottom: $white;
$dropdownLinkColor: $dark-3;
$dropdownLinkColor: $dark-5;
$dropdownLinkColorHover: $link-color;
$dropdownLinkColorActive: $link-color;
......@@ -225,10 +219,7 @@ $horizontalComponentOffset: 180px;
$navbarHeight: 52px;
$navbarBackground: $white;
$navbarBorder: 1px solid $gray-4;
$navbarShadow: 0 0 3px #c1c1c1;
$navbarLinkColor: #444;
$navbarBorder: 1px solid $gray-5;
$navbarButtonBackground: lighten($navbarBackground, 3%);
$navbarButtonBackgroundHighlight: lighten($navbarBackground, 5%);
......@@ -265,7 +256,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;
......@@ -273,7 +264,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;
......@@ -316,13 +307,13 @@ $json-explorer-url-color: $sapphire-base;
// Changelog and diff
// -------------------------
$diff-label-bg: $gray-5;
$diff-label-bg: $gray-7;
$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;
......@@ -360,11 +351,13 @@ $panel-editor-shadow: 0px 0px 8px $gray-3;
$panel-editor-side-menu-shadow: drop-shadow(0 0 2px $gray-3);
$panel-editor-viz-item-shadow: 0 0 4px $gray-3;
$panel-editor-viz-item-border: 1px solid $gray-3;
$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-shadow-hover: 0 0 4px $sapphire-light;
$panel-editor-viz-item-border-hover: 1px solid $sapphire-light;
$panel-editor-viz-item-bg: $white;
$panel-editor-tabs-line-color: $dark-5;
$panel-editor-viz-item-bg-hover: lighten($blue, 62%);
$panel-editor-viz-item-bg-hover: lighten($sapphire-base, 45%);
$panel-options-group-border: none;
$panel-options-group-header-bg: $gray-5;
......
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 {
......
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 {
......
public/sass/components/_settings_permissions.scss deleted 100644 → 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;
}
}
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%;
......
public/sass/pages/_plugins.scss deleted 100644 → 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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment