IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dash-edit-mode

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-10-23 10:03:55 +02:00
parent 2546ec062b 8735a84685
commit 1bb8192a38
3848 changed files with 1039303 additions and 84963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/sass/_variables.dark.scss
View File

@@ -39,12 +39,11 @@ $brand-primary: $orange;
$brand-success: $green;
$brand-warning: $brand-primary;
$brand-danger: $red;
$brand-text-highlight: #f7941d;
// Status colors
// -------------------------
$online: #10a345;
$warn: #ffc03c;
$warn: #F79520;
$critical: #ed2e18;
// Scaffolding
@@ -90,12 +89,12 @@ $component-active-bg: $brand-primary !default;
// Panel
// -------------------------
$panel-bg: $dark-2;
$panel-border: solid 1px $dark-3;
$panel-border: solid 1px $dark-3;
$divider-border-color: #555;
$divider-border-color: #555;
// Graphite Target Editor
$tight-form-border: #050505;
$tight-form-border: #050505;
$tight-form-bg: $dark-3;
$tight-form-func-bg: #333;
@@ -152,6 +151,11 @@ $btn-link-color: $gray-3;
$iconContainerBackground: $black;
$btn-divider-left: $dark-4;
$btn-divider-right: $dark-2;
$btn-drag-image: '../img/grab_dark.svg';
// Forms
// -------------------------
$input-bg: $dark-4;
@@ -164,6 +168,7 @@ $input-border-focus: $input-border-color !default;
$input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder: $gray-1 !default;
$input-label-bg: $dark-3;
$input-invalid-border-color: lighten($red, 5%);
// Search
$search-shadow: 0 0 35px 0 $body-bg;
@@ -184,7 +189,6 @@ $dropdownLinkColorActive: $white;
$dropdownLinkBackgroundActive: $dark-4;
$dropdownLinkBackgroundHover: $dark-4;
// COMPONENT VARIABLES
// --------------------------------------------------
@@ -232,13 +236,13 @@ $paginationActiveBackground: $blue;
// Form states and alerts
// -------------------------
$state-warning-text: darken(#c09853, 10%);
$state-warning-text: $warn;
$state-warning-bg: $brand-warning;
$errorText: #b94a48;
$errorText: #E84D4D;
$errorBackground: $btn-danger-bg;
$successText: #468847;
$successText: #12D95A;
$successBackground: $btn-success-bg;
$infoText: $blue-dark;
@@ -272,3 +276,7 @@ $card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3)
// dash row
$dash-row-background: linear-gradient(135deg, #262626, #292929);
$dash-row-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3);
// footer
$footer-link-color: $gray-1;
$footer-link-hover: $gray-4;