From 9c2809a1a40d9092679398077d7316352d8b33bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 20 Mar 2016 10:31:50 +0100
Subject: [PATCH] ux(): button style tweaks, align with grafana.net styles more

---
 public/sass/_variables.dark.scss     | 10 +++++-----
 public/sass/_variables.scss          |  2 +-
 public/sass/components/_buttons.scss |  5 +++--
 public/sass/mixins/_mixins.scss      |  3 +--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 1bde9554eba..84b01692069 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -126,22 +126,22 @@ $btn-primary-bg-hl:           lighten($brand-primary, 8%);
 $btn-secondary-bg:            $blue-dark;
 $btn-secondary-bg-hl:     		lighten($blue-dark, 3%);
 
-$btn-success-bg-hl:     	    darken($green, 3%);
 $btn-success-bg:              lighten($green, 3%);
+$btn-success-bg-hl:     	    darken($green, 3%);
 
 $btn-warning-bg:              $brand-warning;
 $btn-warning-bg-hl:     	    lighten($brand-warning, 8%);
 
-$btn-danger-bg:               lighten($red, 3%);
-$btn-danger-bg-hl:            darken($red, 3%);
+$btn-danger-bg:               $red;
+$btn-danger-bg-hl:            lighten($red, 5%);
 
 $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-link-color:              $gray-3;
 
-$iconContainerBackground:	  $black;
+$iconContainerBackground:	    $black;
 
 // Forms
 // -------------------------
diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index 60946bd41ba..e96328cb64d 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -216,7 +216,7 @@ $btn-padding-y-sm:               .25rem !default;
 $btn-padding-x-lg:               1.5rem !default;
 $btn-padding-y-lg:               .75rem !default;
 
-$btn-border-radius:              3px;
+$btn-border-radius:              2px;
 
 // sidemenu
 $side-menu-width:  14rem;
diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss
index a68f0642473..a6813c2766c 100644
--- a/public/sass/components/_buttons.scss
+++ b/public/sass/components/_buttons.scss
@@ -95,8 +95,9 @@
 // Inverse appears as dark gray
 .btn-inverse {
   @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color);
-  box-shadow: none;
-  border: 1px solid $tight-form-func-highlight-bg;
+  //background: $card-background;
+  box-shadow: $card-shadow;
+  //border: 1px solid $tight-form-func-highlight-bg;
 }
 
 .btn-outline-primary {
diff --git a/public/sass/mixins/_mixins.scss b/public/sass/mixins/_mixins.scss
index 170a61ed296..b1dd8c047cf 100644
--- a/public/sass/mixins/_mixins.scss
+++ b/public/sass/mixins/_mixins.scss
@@ -282,8 +282,7 @@
   color: $text-color;
   text-shadow: $textShadow;
   @include gradient-vertical($primaryColor, $secondaryColor);
-  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+  border-color: $primaryColor;
 }
 
 // Gradients