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

EPMRPP-87463 || Adjust styles for fields dark theme #3676

Merged
merged 2 commits into from
Nov 28, 2023
Merged

EPMRPP-87463 || Adjust styles for fields dark theme #3676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d41a7
EPMRPP-87463 || Adjust styles for fields dark theme
AmsterGet Nov 28, 2023
4b60244
EPMRPP-87463 || Code review fixes - 1
AmsterGet Nov 28, 2023
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
4 changes: 4 additions & 0 deletions app/src/componentLibrary/autocompletes/common/autocompleteOption/autocompleteOption.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@
&.active {
color: $COLOR--darkmode-topaz-text;
}

&:hover {
color: $COLOR--bg-000;
}
}

&.divider {
Expand Down
6 changes: 6 additions & 0 deletions app/src/componentLibrary/autocompletes/multipleAutocomplete/multipleAutocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,17 @@

.dark {
&.autocomplete {
@include hover-state($COLOR--darkmode-gray-150);
@include focus-state($COLOR--darkmode-topaz-focused);
background-color: $COLOR--darkmode-bg-solid-98;
border-color: $COLOR--darkmode-gray-200;
}

.input {
color: $COLOR--bg-000;
}

&.error.touched {
@include error-state($COLOR--darkmode-error-default);
}
}
12 changes: 8 additions & 4 deletions app/src/componentLibrary/dropdown/dropdownOption/dropdownOption.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,25 @@
cursor: pointer;
}

@mixin hover-state($backgroundColor, $color) {
@mixin hover-state($backgroundColor, $borderColor, $color: $COLOR--almost-black) {
AmsterGet marked this conversation as resolved.
Show resolved Hide resolved
&:hover:not(:active) {
background: $backgroundColor;
}

&.hover:not(.disabled) {
padding: 8px 11px 6px;
background-color: $backgroundColor;
border: 1px solid $color;
border: 1px solid $borderColor;
}

&.hover:not(.disabled):hover {
border: none;
padding: 9px 12px 7px;
}

&:hover:not(.selected) {
color: $color;
}
}

@mixin active-state($color) {
Expand Down Expand Up @@ -72,8 +76,8 @@

.dark {
&.dropdown-option {
@include dropdown-option($COLOR--bg-000);
@include hover-state($COLOR--darkmode-bg-solid-98, $COLOR--darkmode-topaz-focused);
@include dropdown-option($COLOR--darkmode-gray-100);
@include hover-state($COLOR--darkmode-bg-solid-98, $COLOR--darkmode-topaz-focused, $COLOR--bg-000);
@include active-state($COLOR--darkmode-topaz-pressed);

&.selected {
Expand Down
7 changes: 3 additions & 4 deletions app/src/componentLibrary/fieldText/fieldText.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@

&.input-container {
@include input-container($COLOR--darkmode-gray-200, $COLOR--darkmode-bg-solid-98);
@include hover-state($COLOR--darkmode-gray-100);
@include focus-state($COLOR--topaz-focused);
@include hover-state($COLOR--darkmode-gray-150);
@include focus-state($COLOR--darkmode-topaz-focused);

&.error.touched {
@include error-state($COLOR--red-failed-2);
@include error-state($COLOR--darkmode-error-default);
}

&.disabled {
Expand Down Expand Up @@ -284,7 +284,6 @@
&.input {
@include input-base;
@include input-text($COLOR--bg-000);
font-family: $FONT-REGULAR;
}

&.placeholder {
Expand Down
Loading