From 4d4573268e055606c90dfe1c433b1a331e696378 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 2 Mar 2016 10:34:25 +0000
Subject: [PATCH] Fixed heading weight issue Moved colours to variables

---
 app/assets/stylesheets/framework/variables.scss | 12 ++++++++++++
 app/assets/stylesheets/pages/profile.scss       | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0fd2f74cf89..d55d5cfbca5 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -41,6 +41,12 @@ $btn-transparent-color: #8F8F8F;
 $ssh-key-icon-color: #8F8F8F;
 $ssh-key-icon-size: 18px;
 
+$change-username-title-color: #FC6D26;
+$remove-account-title-color: #F00;
+
+$provider-btn-group-border: #E5E5E5;
+$provider-btn-not-active-color: #4688F1;
+
 /*
  * Color schema
  */
@@ -98,8 +104,14 @@ $border-red-light: #F24F41;
 $border-red-normal: #D22852;
 $border-red-dark: #CA264F;
 
+<<<<<<< 454832ace49f1b1742b380441817663051ba8ac8
 $help-well-bg: #FAFAFA;
 $help-well-border: #E5E5E5;
+=======
+$account-well-bg: #FAFAFA;
+$account-well-border: #E5E5E5;
+$account-well-radius: 3px;
+>>>>>>> Fixed heading weight issue
 
 /* header */
 $light-grey-header: #faf9f9;
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index f8aeab6857f..40037c548f3 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -176,17 +176,17 @@
 }
 
 .change-username-title {
-  color: #FC6D26;
+  color: $change-username-title-color;
 }
 
 .remove-account-title {
-  color: #F00;
+  color: $remove-account-title-color;
 }
 
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;
-  border: 1px solid #E5E5E5;
+  border: 1px solid $provider-btn-group-border;
   border-radius: 3px;
 
   &:last-child {
@@ -197,7 +197,7 @@
 .provider-btn-image {
   display: inline-block;
   padding: 5px 10px;
-  border-right: 1px solid #E5E5E5;
+  border-right: 1px solid $provider-btn-group-border;
 
   > img {
     width: 20px;
@@ -212,6 +212,6 @@
   background-color: $gray-light;
 
   &.not-active {
-    color: #4688F1;
+    color: $provider-btn-not-active-color;
   }
 }