Commit 0dffb6db by Matt

Adjusted the border color on the buttons in dashboard nav, fixed alert email…

Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
parent 7dc046d9
...@@ -20,7 +20,7 @@ func init() { ...@@ -20,7 +20,7 @@ func init() {
OptionsTemplate: ` OptionsTemplate: `
<h3 class="page-heading">Email addresses</h3> <h3 class="page-heading">Email addresses</h3>
<div class="gf-form"> <div class="gf-form">
<textarea rows="7" class="gf-form-input width-25" required ng-model="ctrl.model.settings.addresses"></textarea> <textarea rows="7" class="gf-form-input width-27" required ng-model="ctrl.model.settings.addresses"></textarea>
</div> </div>
<div class="gf-form"> <div class="gf-form">
<span>You can enter multiple email addresses using a ";" separator</span> <span>You can enter multiple email addresses using a ";" separator</span>
......
...@@ -103,13 +103,7 @@ $component-active-bg: $brand-primary !default; ...@@ -103,13 +103,7 @@ $component-active-bg: $brand-primary !default;
$panel-bg: #212124; $panel-bg: #212124;
$panel-border-color: $dark-1; $panel-border-color: $dark-1;
$panel-border: solid 1px $panel-border-color; $panel-border: solid 1px $panel-border-color;
$panel-drop-zone-bg: repeating-linear-gradient( $panel-drop-zone-bg: repeating-linear-gradient(-128deg, #111, #111 10px, #191919 10px, #222 20px);
-128deg,
#111,
#111 10px,
#191919 10px,
#222 20px
);
$panel-header-hover-bg: $dark-4; $panel-header-hover-bg: $dark-4;
$panel-header-menu-hover-bg: $dark-5; $panel-header-menu-hover-bg: $dark-5;
$panel-edit-shadow: 0 -30px 30px -30px $black; $panel-edit-shadow: 0 -30px 30px -30px $black;
...@@ -134,8 +128,7 @@ $code-tag-border: lighten($code-tag-bg, 2%); ...@@ -134,8 +128,7 @@ $code-tag-border: lighten($code-tag-bg, 2%);
// cards // cards
$card-background: linear-gradient(135deg, #2f2f32, #262628); $card-background: linear-gradient(135deg, #2f2f32, #262628);
$card-background-hover: linear-gradient(135deg, #343436, #262628); $card-background-hover: linear-gradient(135deg, #343436, #262628);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, 0.1), $card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, 0.1), 1px 1px 0 0 rgba(0, 0, 0, 0.3);
1px 1px 0 0 rgba(0, 0, 0, 0.3);
// Lists // Lists
$list-item-bg: $card-background; $list-item-bg: $card-background;
...@@ -188,7 +181,7 @@ $iconContainerBackground: $black; ...@@ -188,7 +181,7 @@ $iconContainerBackground: $black;
$btn-divider-left: $dark-4; $btn-divider-left: $dark-4;
$btn-divider-right: $dark-2; $btn-divider-right: $dark-2;
$btn-drag-image: "../img/grab_dark.svg"; $btn-drag-image: '../img/grab_dark.svg';
// Forms // Forms
// ------------------------- // -------------------------
...@@ -259,7 +252,7 @@ $navbarDropdownShadow: inset 0px 4px 10px -4px $body-bg; ...@@ -259,7 +252,7 @@ $navbarDropdownShadow: inset 0px 4px 10px -4px $body-bg;
$navbarButtonBackground: $navbarBackground; $navbarButtonBackground: $navbarBackground;
$navbarButtonBackgroundHighlight: $body-bg; $navbarButtonBackgroundHighlight: $body-bg;
$navbar-button-border: #151515; $navbar-button-border: #2f2f32;
// Sidemenu // Sidemenu
// ------------------------- // -------------------------
...@@ -325,14 +318,10 @@ $tooltipLinkColor: $link-color; ...@@ -325,14 +318,10 @@ $tooltipLinkColor: $link-color;
$graph-tooltip-bg: $dark-1; $graph-tooltip-bg: $dark-1;
// images // images
$checkboxImageUrl: "../img/checkbox.png"; $checkboxImageUrl: '../img/checkbox.png';
// info box // info box
$info-box-background: linear-gradient( $info-box-background: linear-gradient(100deg, $blue-dark, darken($blue-dark, 5%));
100deg,
$blue-dark,
darken($blue-dark, 5%)
);
$info-box-color: $gray-4; $info-box-color: $gray-4;
// footer // footer
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
} }
.dashboard-settings__aside { .dashboard-settings__aside {
padding: 30px 0 0 30px; padding: 27px 0 0 30px;
background: $panel-bg; background: $panel-bg;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
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