Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new accent theme colors #3230

Merged
merged 1 commit into from
Jun 19, 2018
Merged

Use new accent theme colors #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions client/app/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ a {
}

&-matched {
border-color: $color-accent-blue;
border-color: $color-blue-400;
}

}
Expand Down Expand Up @@ -524,8 +524,8 @@ a {
}

.match {
background-color: transparentize($color-accent-blue, 0.25);
border: 1px solid $color-accent-blue;
background-color: transparentize($color-blue-400, 0.25);
border: 1px solid $color-blue-400;
}
}

Expand All @@ -546,7 +546,7 @@ a {
}
.shadow {
fill: none;
stroke: $color-accent-blue;
stroke: $color-blue-400;
stroke-opacity: 0;
}
&.highlighted {
Expand All @@ -573,7 +573,7 @@ a {

.highlight-border {
fill: none;
stroke: $color-accent-blue;
stroke: $color-blue-400;
stroke-width: 0.7 + $node-highlight-stroke-width * 2;
stroke-opacity: $node-highlight-stroke-opacity;
}
Expand Down Expand Up @@ -651,7 +651,7 @@ a {
display: inline-block;
margin: 1px;
padding: 2px 4px;
background-color: transparentize($color-accent-blue, 0.9);
background-color: transparentize($color-blue-400, 0.9);
}

&-label {
Expand All @@ -662,7 +662,7 @@ a {

&-more {
font-size: $font-size-tiny;
color: $color-turquoise;
color: $color-blue-700;
margin-top: -2px;
}
}
Expand Down Expand Up @@ -741,8 +741,8 @@ a {
}

.match {
background-color: transparentize($color-accent-blue, 0.7);
border: 1px solid $color-accent-blue;
background-color: transparentize($color-blue-400, 0.7);
border: 1px solid $color-blue-400;
}

&-header {
Expand Down Expand Up @@ -1135,7 +1135,7 @@ a {
}

.new-image {
color: $color-status-info;
color: $color-blue-600;
}

a {
Expand Down Expand Up @@ -1451,7 +1451,7 @@ a {

.fa {
margin-left: 4px;
color: $color-accent-orange;
color: $color-orange-500;
}

&-wrapper {
Expand Down Expand Up @@ -1742,13 +1742,13 @@ a {
}

&-matched &-input {
border-color: $color-accent-blue;
border-color: $color-blue-400;
}

}

.search-item {
background-color: transparentize($color-accent-blue, 0.2);
background-color: transparentize($color-blue-400, 0.2);
border-radius: $border-radius-soft;
margin: 1px 0 1px 1.5em;
padding: 2px 4px 2px 6px;
Expand Down Expand Up @@ -1807,7 +1807,7 @@ a {
}

&-header {
background-color: $color-accent-blue;
background-color: $color-blue-400;
padding: 12px 24px;
color: $color-white;

Expand Down Expand Up @@ -2056,8 +2056,8 @@ a {
// because we want consistent behaviour between the
// visual and row locking logic that happens on hover.
tbody tr.selected, tbody tr.focused {
background-color: transparentize($color-accent-blue, 0.85);
border: 1px solid $color-accent-blue;
background-color: transparentize($color-blue-400, 0.85);
border: 1px solid $color-blue-400;
}
}

Expand Down
2 changes: 1 addition & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"reselect": "3.0.1",
"reselect-map": "1.0.3",
"styled-components": "2.2.4",
"weaveworks-ui-components": "0.5.1",
"weaveworks-ui-components": "0.5.3",
"whatwg-fetch": "2.0.3",
"xterm": "3.3.0"
},
Expand Down
6 changes: 3 additions & 3 deletions client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8345,9 +8345,9 @@ wd@^0.4.0:
underscore.string "~3.0.3"
vargs "~0.1.0"

weaveworks-ui-components@0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.5.1.tgz#dbb8f73ab28161a2e2f0c5b164fb952a0be35b10"
weaveworks-ui-components@0.5.3:
version "0.5.3"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.5.3.tgz#0230265d87e41bdd9483986714c80b644c0d4bfb"
dependencies:
classnames "2.2.5"
d3-drag "1.2.1"
Expand Down