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

Update dropdown style #428

Merged
merged 4 commits into from
Jul 3, 2023
+14 −0
Merged

Update dropdown style #428

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6fcfd5
update dropdown style
Jun 13, 2023
b46e1f7
update changelog
Jun 13, 2023
5463807
update changelog
Jul 3, 2023
f49ac45
rename val for color
Jul 3, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@

- Add locales for TitleService (INDIGO Sprint 230526, [!423](https://github.com/TeskaLabs/asab-webui/pull/423))

- Add styles for primary dropdown-toggle (INDIGO Sprint 230609, [!428](https://github.com/TeskaLabs/asab-webui/pull/428))

### Bugfix

- Bug fix for HelpComponent, not display a Helpcomoponent when the user changing the page (INDIGO Sprint 230317, [!401](https://github.com/TeskaLabs/asab-webui/pull/401))
Expand Down
12 changes: 12 additions & 0 deletions src/styles/components/dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
--text-dropdown-button: var(--text-color);
--text-dropdown-button-color: var(--dark-black);
--toggle-text-color: var(--off-white);
--primary-txt: var(--white);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aringocode Rename it to --reversed-text-dropdown-color to stick with the naming convention

--primary-outline-text: var(--dark-blue);
--primary-outline-bg: var(--light-violet);
--hover-bg: var(--white);
Expand All @@ -21,10 +22,12 @@
--text-dropdown-color: var(--btn-txt);
--text-dropdown-button-color: var(--light-dream-blue);
--toggle-text-color: var(--night-blue);
--primary-txt: var(--light-black);
--primary-outline-text: var(--night-blue);
--primary-outline-bg: var(--storm-blue);
--hover-bg: var(--dream-blue);
--disabled-dropdown-item: var(--feather-gray);

}

$dropdown-toggle-bg: var(--bg);
Expand All @@ -37,6 +40,7 @@ $primary-outline-text: var(--primary-outline-text);
$primary-outline-bg: var(--primary-outline-bg);
$hover-bg: var(--hover-bg);
$disabled-dropdown-item: var(--disabled-dropdown-item);
$primary-txt: var(--primary-txt);


.dropdown, .dropdown .btn {
Expand Down Expand Up @@ -199,6 +203,14 @@ $disabled-dropdown-item: var(--disabled-dropdown-item);
}
}

// Primary style
.btn-primary.dropdown-toggle {
color: $primary-txt;
& [class^="cil-"] {
color: $primary-txt;
}
}

// Primary outline style
.btn-outline-primary.dropdown-toggle {
color: $primary-outline-text;
Expand Down