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

Merge neutral theme colors #3146

Merged
merged 2 commits into from
Apr 16, 2018
Merged

Merge neutral theme colors #3146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f9641
Merge neutral theme colors.
fbarl Apr 16, 2018
d812e14
Bump ui-components to v0.4.55
fbarl Apr 16, 2018
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
Next Next commit
Merge neutral theme colors.
  • Loading branch information
@fbarl
fbarl committed Apr 16, 2018
commit a4f9641bd6888d75d4a0eb9626f0005fa5ca9a65
12 changes: 6 additions & 6 deletions client/app/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand All @@ -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;
}

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

&-current-topology {
text-transform: uppercase;
color: $color-lavender;
color: $color-primary-lavender;
}

&-fields {
Expand Down
2 changes: 1 addition & 1 deletion client/app/styles/_contrast-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/app/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down