From dc8d66520b6d2187d55644092e74b18350ce838e Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sat, 11 Feb 2017 01:01:22 +0100
Subject: [PATCH] Use $link-color for text and $brand-primary for
 backgrounds/buttons

closes #7318
---
 Changelog.md                                    | 1 +
 app/assets/stylesheets/bootstrap-variables.scss | 2 +-
 app/assets/stylesheets/conversations.scss       | 4 ++--
 app/assets/stylesheets/header.scss              | 4 ++--
 app/assets/stylesheets/markdown-editor.scss     | 2 +-
 app/assets/stylesheets/navbar_left.scss         | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 54e8571d8..6f77142e3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 # 0.6.4.0
 
 ## Refactor
+* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
 
 ## Bug fixes
 * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss
index 163b0d5d3..56b81647e 100644
--- a/app/assets/stylesheets/bootstrap-variables.scss
+++ b/app/assets/stylesheets/bootstrap-variables.scss
@@ -676,7 +676,7 @@ $list-group-border: transparent;
 $list-group-border-radius: 0;
 
 //** Background color of single list items on hover
-$list-group-hover-bg: $link-color;
+$list-group-hover-bg: $brand-primary;
 //** Text color of active list items
 $list-group-active-color: $white;
 //** Background color of active list items
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index daba66500..2c5b7b7e7 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -73,7 +73,7 @@
     }
 
     &:hover, &.unread:hover, &.selected:hover {
-      background-color: lighten($link-color, 5%);
+      background-color: lighten($brand-primary, 5%);
       cursor: pointer;
       .participants {
         border-color: rgba($border-grey, 1);
@@ -84,7 +84,7 @@
     }
 
     &.unread { background-color: $background-grey; }
-    &.selected { background-color: $link-color; }
+    &.selected { background-color: $brand-primary; }
 
     .last_author, .last_message {
       font-size: 12px;
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index 668cef21c..4e883094e 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -53,7 +53,7 @@
           color: $gray-light;
           padding-left: 55px;
           &:hover {
-            background-color: $link-color;
+            background-color: $brand-primary;
             color: $gray-lighter;
           }
         }
@@ -105,7 +105,7 @@
         }
       }
       .view_all {
-        background-color: $link-color;
+        background-color: $brand-primary;
         border-top: 3px solid $dropdown-bg;
         text-align: center;
         a {
diff --git a/app/assets/stylesheets/markdown-editor.scss b/app/assets/stylesheets/markdown-editor.scss
index e6a679258..b077a7b44 100644
--- a/app/assets/stylesheets/markdown-editor.scss
+++ b/app/assets/stylesheets/markdown-editor.scss
@@ -115,7 +115,7 @@
   > li {
     > a { padding: 7px 15px; }
 
-    &:not(.active) * { color: $brand-primary; }
+    &:not(.active) * { color: $link-color; }
 
     &.active * { color: $black; }
   }
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 0d93bf9e3..56134c3bf 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -24,8 +24,8 @@
     }
 
     &:hover, &:hover a, &:hover [class^="entypo"] {
-      background-color: $link-color;
-      border-color: $link-color;
+      background-color: $brand-primary;
+      border-color: $brand-primary;
       color: $white;
     }
   }