Merge branch 'ui-colors' into 'master'

Refactoring ui colors

8 files changed, 16 insertions, 12 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 6ab6458ea0d..0cb2090f53d 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -60,7 +60,7 @@ pre {
 
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
-  background: #29b;
+  background: $bg_style_color;
   color: #FFF
 }
 
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 8cc72d7f07a..4ab83786b50 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -40,7 +40,7 @@ a {
   color: $link_color;
   &:hover {
     text-decoration: none;
-    color: $primary_color;
+    color: $link_hover_color;
   }
 
   &:focus {
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 3312c762ed1..3bff2156c33 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -9,6 +9,7 @@
 $font-size-base: 13px !default;
 $nav-pills-active-link-hover-bg: $bg_primary;
 $pagination-active-bg: $bg_primary;
+$list-group-active-bg: $bg_style_color;
 
 // Core variables and mixins
 @import "bootstrap/variables";
diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index 6ea6a8303f4..8bcdad35792 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -1,14 +1,17 @@
-/**
+/*
  * General Colors
  */
-$primary_color: #2FA0BB;
-$link_color: #3A89A3;
 $style_color: #474D57;
 $bg_style_color: #2299BB;
-$list-group-active-bg: $bg_style_color;
 $hover: #D9EDF7;
 
 /*
+ * Link colors
+ */
+$link_color: #446e9b;
+$link_hover_color: #2FA0BB;
+
+/*
  * Success colors (green)
  */
 $border_success: #469408;
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 88f16a21596..59eaaec9498 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -64,7 +64,7 @@
             left: 50%;
             width: 0;
             height: 0;
-            border-color: transparent transparent #29b transparent;
+            border-color: transparent transparent $link_color transparent;
             border-style: solid;
             border-width: 6px;
             margin-left: -6px;
@@ -116,7 +116,7 @@
         padding: 5px 0;
 
         &.active {
-          background-color: $primary_color;
+          background-color: $link_hover_color;
 
           a {
             color: #fff;
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 2758f57bd54..e8d6ec3e29a 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -37,7 +37,7 @@ ul.notes {
       font-weight: bold;
       font-size: 14px;
       &:hover {
-        color: $primary_color;
+        color: $link_hover_color;
       }
     }
   }
@@ -172,7 +172,7 @@ ul.notes {
       @extend .cgray;
 
       &:hover {
-        color: $primary_color;
+        color: $link_hover_color;
         &.danger { @extend .cred; }
       }
     }
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 5757858a1ce..949d646afcd 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -85,7 +85,7 @@
 
   .btn {
     background: none;
-    color: #29b;
+    color: $link_color;
 
     &.active {
       color: #333;
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index 86e2a51641a..db177a0083c 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -53,7 +53,7 @@
       vertical-align: middle;
       a {
         &:hover {
-          color: $primary_color;
+          color: $link_hover_color;
         }
       }