github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 20:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3146 from weaveworks/175-merge-neutral-theme-colors

Browse Source 
Merge neutral theme colors
This commit is contained in:
Filip Barl
2018-04-16 16:41:20 +02:00
committed by GitHub
parent 4b85be0d7e d812e14987
commit 65bb232c36
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/app/styles/_base.scss
+6 -6
View File
@@ -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 {
client/app/styles/_contrast-overrides.scss
+1 -1
View File
@@ -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;
client/app/styles/_variables.scss
+1 -1
View File
@@ -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;
client/package.json
+1 -1
View File
@@ -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"
},
client/yarn.lock
+3 -3
View File
@@ -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"