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 1/2] 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;
 

From d812e149873644ba532e295603519e0f98d05835 Mon Sep 17 00:00:00 2001
From: Filip Barl <filip.barl@gmail.com>
Date: Mon, 16 Apr 2018 16:37:34 +0200
Subject: [PATCH 2/2] Bump ui-components to v0.4.55

---
 client/package.json | 2 +-
 client/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/package.json b/client/package.json
index 727ead9b7..2fcfdd759 100644
--- a/client/package.json
+++ b/client/package.json
@@ -44,7 +44,7 @@
     "reselect": "3.0.1",
     "reselect-map": "1.0.3",
     "styled-components": "2.2.4",
-    "weaveworks-ui-components": "0.4.53",
+    "weaveworks-ui-components": "0.4.55",
     "whatwg-fetch": "2.0.3",
     "xterm": "2.9.2"
   },
diff --git a/client/yarn.lock b/client/yarn.lock
index a4cdeb4e1..06f0ed629 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7591,9 +7591,9 @@ wd@^0.4.0:
     underscore.string "~3.0.3"
     vargs "~0.1.0"
 
-weaveworks-ui-components@0.4.53:
-  version "0.4.53"
-  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.53.tgz#4d5d089ebcf07652110e89b23e9d3448ac1a119a"
+weaveworks-ui-components@0.4.55:
+  version "0.4.55"
+  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.55.tgz#3a8ec801a18fb880fe5198fe3be94a8ced5a4a53"
   dependencies:
     classnames "2.2.5"
     d3-drag "1.2.1"