From a4f9641bd6888d75d4a0eb9626f0005fa5ca9a65 Mon Sep 17 00:00:00 2001
From: Filip Barl <filip.barl@gmail.com>
Date: Mon, 16 Apr 2018 15:49:41 +0200
Subject: [PATCH] Merge neutral theme colors.

---
 client/app/styles/_base.scss               | 12 ++++++------
 client/app/styles/_contrast-overrides.scss |  2 +-
 client/app/styles/_variables.scss          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss
index c5557f2fa..66d26255e 100644
--- a/client/app/styles/_base.scss
+++ b/client/app/styles/_base.scss
@@ -1826,13 +1826,13 @@ a {
       padding: 4px 5px;
       margin-left: 2px;
       font-size: 110%;
-      color: $color-lavender;
+      color: $color-primary-lavender;
       cursor: pointer;
       border: 1px solid transparent;
       border-radius: 10%;
 
       &:hover {
-        border-color: transparentize($color-lavender, 0.4);
+        border-color: transparentize($color-primary-lavender, 0.4);
       }
     }
 
@@ -1848,15 +1848,15 @@ a {
       text-transform: uppercase;
       line-height: 150%;
       font-size: 125%;
-      color: $color-lavender;
+      color: $color-primary-lavender;
       padding: 4px 0;
-      border-bottom: 1px solid transparentize($color-lavender, 0.9);
+      border-bottom: 1px solid transparentize($color-primary-lavender, 0.9);
     }
 
     h3 {
       text-transform: uppercase;
       font-size: 90%;
-      color: $color-lavender;
+      color: $color-primary-lavender;
       padding: 4px 0;
     }
 
@@ -1919,7 +1919,7 @@ a {
 
     &-current-topology {
       text-transform: uppercase;
-      color: $color-lavender;
+      color: $color-primary-lavender;
     }
 
     &-fields {
diff --git a/client/app/styles/_contrast-overrides.scss b/client/app/styles/_contrast-overrides.scss
index 29ceccdbc..f528097db 100644
--- a/client/app/styles/_contrast-overrides.scss
+++ b/client/app/styles/_contrast-overrides.scss
@@ -6,7 +6,7 @@ $background-darker-color: $color-blue-haze;
 $background-darker-secondary-color: $color-blue-haze;
 $background-dark-color: $color-primary-charcoal;
 $text-color: $color-black;
-$text-secondary-color: $color-neutral-black;
+$text-secondary-color: $color-black;
 $text-tertiary-color: $color-tundora;
 $border-light-color: $color-solid-gray;
 $text-darker-color: $color-black;
diff --git a/client/app/styles/_variables.scss b/client/app/styles/_variables.scss
index af2a47b20..1743541ce 100644
--- a/client/app/styles/_variables.scss
+++ b/client/app/styles/_variables.scss
@@ -11,7 +11,7 @@ $background-darker-secondary-color: $color-mercury;
 $background-dark-color: $color-primary-charcoal;
 $text-color: $color-gunpowder;
 $text-secondary-color: $color-comet;
-$text-tertiary-color: $color-lavender;
+$text-tertiary-color: $color-primary-lavender;
 $border-light-color: $color-mischka;
 $text-darker-color: $color-primary-charcoal;