Commit 9c2809a1 by Torkel Ödegaard

ux(): button style tweaks, align with grafana.net styles more

parent 73e5c70d
...@@ -126,22 +126,22 @@ $btn-primary-bg-hl: lighten($brand-primary, 8%); ...@@ -126,22 +126,22 @@ $btn-primary-bg-hl: lighten($brand-primary, 8%);
$btn-secondary-bg: $blue-dark; $btn-secondary-bg: $blue-dark;
$btn-secondary-bg-hl: lighten($blue-dark, 3%); $btn-secondary-bg-hl: lighten($blue-dark, 3%);
$btn-success-bg-hl: darken($green, 3%);
$btn-success-bg: lighten($green, 3%); $btn-success-bg: lighten($green, 3%);
$btn-success-bg-hl: darken($green, 3%);
$btn-warning-bg: $brand-warning; $btn-warning-bg: $brand-warning;
$btn-warning-bg-hl: lighten($brand-warning, 8%); $btn-warning-bg-hl: lighten($brand-warning, 8%);
$btn-danger-bg: lighten($red, 3%); $btn-danger-bg: $red;
$btn-danger-bg-hl: darken($red, 3%); $btn-danger-bg-hl: lighten($red, 5%);
$btn-inverse-bg: $dark-3; $btn-inverse-bg: $dark-3;
$btn-inverse-bg-hl: lighten($dark-3, 1%); $btn-inverse-bg-hl: lighten($dark-3, 4%);
$btn-inverse-text-color: $link-color; $btn-inverse-text-color: $link-color;
$btn-link-color: $gray-3; $btn-link-color: $gray-3;
$iconContainerBackground: $black; $iconContainerBackground: $black;
// Forms // Forms
// ------------------------- // -------------------------
......
...@@ -216,7 +216,7 @@ $btn-padding-y-sm: .25rem !default; ...@@ -216,7 +216,7 @@ $btn-padding-y-sm: .25rem !default;
$btn-padding-x-lg: 1.5rem !default; $btn-padding-x-lg: 1.5rem !default;
$btn-padding-y-lg: .75rem !default; $btn-padding-y-lg: .75rem !default;
$btn-border-radius: 3px; $btn-border-radius: 2px;
// sidemenu // sidemenu
$side-menu-width: 14rem; $side-menu-width: 14rem;
......
...@@ -95,8 +95,9 @@ ...@@ -95,8 +95,9 @@
// Inverse appears as dark gray // Inverse appears as dark gray
.btn-inverse { .btn-inverse {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color); @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color);
box-shadow: none; //background: $card-background;
border: 1px solid $tight-form-func-highlight-bg; box-shadow: $card-shadow;
//border: 1px solid $tight-form-func-highlight-bg;
} }
.btn-outline-primary { .btn-outline-primary {
......
...@@ -282,8 +282,7 @@ ...@@ -282,8 +282,7 @@
color: $text-color; color: $text-color;
text-shadow: $textShadow; text-shadow: $textShadow;
@include gradient-vertical($primaryColor, $secondaryColor); @include gradient-vertical($primaryColor, $secondaryColor);
border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%); border-color: $primaryColor;
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
} }
// Gradients // Gradients
......
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