diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss index f47e356f2..87c754eab 100644 --- a/client/app/styles/_base.scss +++ b/client/app/styles/_base.scss @@ -347,7 +347,7 @@ a { &-active, &:hover { color: $text-color; - background-color: $background-darker-secondary-color; + background-color: $background-darker-color; } &-active { @@ -1171,7 +1171,7 @@ a { &-metric-box { @extend .palable; cursor: pointer; - fill: transparentize($color-dusty-gray, 0.6); + fill: transparentize($color-dove-gray, 0.6); &-info { background-color: transparentize($color-white, 0.4); @@ -1512,7 +1512,7 @@ a { background-color: transparent; &-selected, &:not([disabled]):hover { - background-color: $background-darker-secondary-color; + background-color: $background-darker-color; } &:not(:last-child) { @@ -1873,13 +1873,13 @@ a { padding: 3px 5px; font-size: $font-size-tiny; line-height: 10px; - color: $color-dim-gray; + color: $color-dove-gray; vertical-align: middle; - background-color: $color-alabaster; + background-color: $color-white; border: solid 1px $color-silver; - border-bottom-color: $color-gray; + border-bottom-color: $color-dove-gray; border-radius: $border-radius-soft; - box-shadow: inset 0 -1px 0 $color-gray; + box-shadow: inset 0 -1px 0 $color-dove-gray; } div.key { width: 60px; @@ -2083,7 +2083,7 @@ a { thead { box-shadow: 0 4px 2px -2px transparentize($color-black, 0.84); - border-bottom: 1px solid $color-gray; + border-bottom: 1px solid $color-dove-gray; } tbody { diff --git a/client/app/styles/_contrast-overrides.scss b/client/app/styles/_contrast-overrides.scss index f528097db..f2e5800a9 100644 --- a/client/app/styles/_contrast-overrides.scss +++ b/client/app/styles/_contrast-overrides.scss @@ -7,8 +7,8 @@ $background-darker-secondary-color: $color-blue-haze; $background-dark-color: $color-primary-charcoal; $text-color: $color-black; $text-secondary-color: $color-black; -$text-tertiary-color: $color-tundora; -$border-light-color: $color-solid-gray; +$text-tertiary-color: $color-black; +$border-light-color: $color-dove-gray; $text-darker-color: $color-black; $edge-color: $color-black; diff --git a/client/app/styles/_variables.scss b/client/app/styles/_variables.scss index b9d260791..27aeb2ffc 100644 --- a/client/app/styles/_variables.scss +++ b/client/app/styles/_variables.scss @@ -2,10 +2,10 @@ $fa-font-path: "~font-awesome/fonts"; $base-ease: ease-in-out; -$background-color: $color-lightgray; +$background-color: $color-gallery; $background-lighter-color: $color-white; -$background-darker-color: $color-silver; -$background-darker-secondary-color: $color-mercury; +$background-darker-color: transparentize($color-silver, 0.5); +$background-darker-secondary-color: $color-gallery; $background-dark-color: $color-primary-charcoal; $text-color: $color-gunpowder; $text-secondary-color: $color-comet; @@ -46,4 +46,4 @@ $timeline-height: 55px; /* specific elements */ $body-background-color: $color-white-smoke; -$label-background-color: transparentize($color-lightgray, 0.3); +$label-background-color: transparentize($color-gallery, 0.3); diff --git a/client/package.json b/client/package.json index 528e96235..194d8364c 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.95", + "weaveworks-ui-components": "0.4.97", "whatwg-fetch": "2.0.3", "xterm": "3.3.0" }, diff --git a/client/yarn.lock b/client/yarn.lock index 78ccda3fd..b939e10aa 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -8345,9 +8345,9 @@ wd@^0.4.0: underscore.string "~3.0.3" vargs "~0.1.0" -weaveworks-ui-components@0.4.95: - version "0.4.95" - resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.95.tgz#6f80f8e00e4fcef06033cadc377588bc3ed443fa" +weaveworks-ui-components@0.4.97: + version "0.4.97" + resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.97.tgz#eaf4e68ca380d074d389bc11deee263944f02a94" dependencies: classnames "2.2.5" d3-drag "1.2.1"