From 190432296d3e1b936d3ac3584bf084c8556930b5 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Fri, 17 Aug 2018 10:40:57 +0200
Subject: [PATCH] removed inverse btn styling and added bgColor to generic
 oauth and grafana.com login buttons, added styling so log in button uses dark
 theme inverse btn styling both for dark and light theme

---
 public/app/partials/login.html | 4 ++--
 public/sass/_variables.scss    | 4 ++--
 public/sass/pages/_login.scss  | 9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 87b3cada7b5..656103adce2 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -55,12 +55,12 @@
             <i class="btn-service-icon fa fa-gitlab"></i>
             Sign in with GitLab
           </a>
-          <a class="btn btn-medium btn-inverse btn-service btn-service--grafanacom login-btn" href="login/grafana_com" target="_self"
+          <a class="btn btn-medium btn-service btn-service--grafanacom login-btn" href="login/grafana_com" target="_self"
             ng-if="oauth.grafana_com">
             <i class="btn-service-icon"></i>
             Sign in with Grafana.com
           </a>
-          <a class="btn btn-medium btn-inverse btn-service btn-service--oauth login-btn" href="login/generic_oauth" target="_self"
+          <a class="btn btn-medium btn-service btn-service--oauth login-btn" href="login/generic_oauth" target="_self"
             ng-if="oauth.generic_oauth">
             <i class="btn-service-icon fa fa-sign-in"></i>
             Sign in with {{oauth.generic_oauth.name}}
diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index fc5b08ccff9..841f06156ac 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -197,7 +197,7 @@ $external-services: (
     github: (bgColor: #464646, borderColor: #393939, icon: ''),
     gitlab: (bgColor: #fc6d26, borderColor: #e24329, icon: ''),
     google: (bgColor: #e84d3c, borderColor: #b83e31, icon: ''),
-    grafanacom: (bgColor: inherit, borderColor: #393939, icon: ''),
-    oauth: (bgColor: inherit, borderColor: #393939, icon: '')
+    grafanacom: (bgColor: #262628, borderColor: #393939, icon: ''),
+    oauth: (bgColor: #262628, borderColor: #393939, icon: '')
   )
   !default;
diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss
index 9a4260576b1..8e5c8f33e37 100644
--- a/public/sass/pages/_login.scss
+++ b/public/sass/pages/_login.scss
@@ -76,6 +76,15 @@ select:-webkit-autofill:focus {
       margin-left: 1rem;
     }
   }
+  & .btn-inverse {
+    color: #e3e3e3;
+    text-shadow: 0px 1px 0 rgba(0, 0, 0, 0.1);
+    background-color: #2a2a2c;
+    background-image: linear-gradient(to bottom, #262628, #303032);
+    background-repeat: repeat-x;
+    border-color: #262628;
+    box-shadow: -1px -1px 0 0 rgba(255, 255, 255, 0.1), 1px 1px 0 0 rgba(0, 0, 0, 0.3);
+  }
 }
 
 .login-button-forgot-password {