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

feat(split-button): Make dividers consistent #9402

Merged
merged 13 commits into from
May 23, 2024
Merged

feat(split-button): Make dividers consistent #9402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3e9e5e
feat(split-button): Make dividers consistent
josercarcamo May 9, 2024
b1f6fd6
Merge branch 'main' into josercarcamo/8142-split-button-consistent-di…
josercarcamo May 9, 2024
acde42d
Refactored solution and emoved split bar expansion when hovering over…
josercarcamo May 13, 2024
bbfc07c
Merge branch 'josercarcamo/8142-split-button-consistent-dividers' of …
josercarcamo May 13, 2024
6815bec
Merge branch 'main' into josercarcamo/8142-split-button-consistent-di…
josercarcamo May 13, 2024
3df4cba
Removed overridden lines per code review
josercarcamo May 14, 2024
fcdec40
Refactored mutliple transparent lines
josercarcamo May 14, 2024
908b968
Fixed background of divider when the background of root is set
josercarcamo May 22, 2024
8b57deb
Added outline-fill demos and merged master
josercarcamo May 23, 2024
b506d5a
Merge branch 'main' into josercarcamo/8142-split-button-consistent-di…
josercarcamo May 23, 2024
42bb6f0
Merge branch 'main' into josercarcamo/8142-split-button-consistent-di…
josercarcamo May 23, 2024
117c6ea
Renamed variables per code review
josercarcamo May 23, 2024
4e43fe7
Merge branch 'main' into josercarcamo/8142-split-button-consistent-di…
josercarcamo May 23, 2024
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
75 changes: 49 additions & 26 deletions packages/calcite-components/src/components/split-button/split-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,55 +15,72 @@
}

:host([kind="brand"]) {
--calcite-split-button-background: theme("colors.brand");
--calcite-split-button-divider: theme("colors.background.foreground.1");
--calcite-internal-split-button-background: theme("colors.brand");
--calcite-internal-split-button-divider: theme("colors.background.foreground.1");
}

:host([kind="danger"]) {
--calcite-split-button-background: theme("colors.danger");
--calcite-split-button-divider: theme("colors.background.foreground.1");
--calcite-internal-split-button-background: theme("colors.danger");
--calcite-internal-split-button-divider: theme("colors.background.foreground.1");
}

:host([kind="neutral"]) {
--calcite-split-button-background: theme("colors.background.foreground.3");
--calcite-split-button-divider: theme("colors.color.1");
--calcite-internal-split-button-background: theme("colors.background.foreground.3");
--calcite-internal-split-button-divider: theme("colors.color.1");
}

:host([kind="inverse"]) {
--calcite-split-button-background: var(--calcite-color-inverse);
--calcite-split-button-divider: theme("colors.background.foreground.1");
--calcite-internal-split-button-background: var(--calcite-color-inverse);
--calcite-internal-split-button-divider: theme("colors.background.foreground.1");
}

:host([appearance="transparent"]) {
--calcite-split-button-background: transparent;
--calcite-internal-split-button-background: transparent;
&:host([kind="brand"]) {
--calcite-split-button-divider: theme("colors.brand");
--calcite-internal-split-button-divider: theme("colors.brand");
}
&:host([kind="danger"]) {
--calcite-split-button-divider: theme("colors.danger");
--calcite-internal-split-button-divider: theme("colors.danger");
}
&:host([kind="neutral"]) {
--calcite-split-button-divider: theme("colors.color.1");
--calcite-internal-split-button-divider: theme("colors.color.1");
}
&:host([kind="inverse"]) {
--calcite-split-button-divider: theme("colors.background.foreground.1");
--calcite-internal-split-button-divider: theme("colors.background.foreground.1");
}
}

:host([appearance="outline"]) {
&:host([kind="brand"]),
&:host([kind="danger"]),
&:host([kind="neutral"]),
&:host([kind="inverse"]) {
--calcite-internal-split-button-background: transparent;
}
}

:host([appearance="outline-fill"]) {
&:host([kind="brand"]),
&:host([kind="danger"]),
&:host([kind="neutral"]),
&:host([kind="inverse"]) {
--calcite-internal-split-button-background: var(--calcite-color-background);
}
}

:host([appearance="outline"]),
:host([appearance="outline-fill"]) {
--calcite-split-button-background: transparent;
&:host([kind="brand"]) {
--calcite-split-button-divider: theme("colors.brand");
--calcite-internal-split-button-divider: theme("colors.brand");
}
&:host([kind="danger"]) {
--calcite-split-button-divider: theme("colors.danger");
--calcite-internal-split-button-divider: theme("colors.danger");
}
&:host([kind="neutral"]) {
--calcite-split-button-divider: theme("borderColor.color.1");
--calcite-internal-split-button-divider: theme("borderColor.color.1");
}
&:host([kind="inverse"]) {
--calcite-split-button-divider: var(--calcite-color-inverse);
--calcite-internal-split-button-divider: var(--calcite-color-inverse);
}
}

Expand All @@ -76,48 +93,54 @@

.divider-container {
@apply transition-default flex w-px items-stretch;
background-color: var(--calcite-split-button-background);
background-color: var(--calcite-internal-split-button-background);
}

.divider {
@apply my-1 inline-block w-px;
background-color: var(--calcite-split-button-divider);
background-color: var(--calcite-internal-split-button-divider);
}

:host([appearance="outline-fill"]),
:host([appearance="outline"]) {
.divider-container {
border-block: 1px solid var(--calcite-split-button-divider);
border-block: 1px solid var(--calcite-internal-split-button-divider);
}
&:hover .divider-container {
background-color: var(--calcite-split-button-divider);
background-color: var(--calcite-internal-split-button-divider);
}
}

:host([appearance="outline-fill"]:hover),
:host([appearance="outline"]:hover) {
.divider-container {
background-color: var(--calcite-split-button-divider);
background-color: var(--calcite-internal-split-button-divider);
}
}

:host([appearance="outline-fill"]:focus-within),
:host([appearance="outline"]:focus-within) {
&:host([kind="brand"]) {
--calcite-split-button-divider: theme("colors.brand-press");
--calcite-internal-split-button-divider: theme("colors.brand-press");
}
&:host([kind="danger"]) {
--calcite-split-button-divider: theme("colors.danger-press");
--calcite-internal-split-button-divider: theme("colors.danger-press");
}
.divider-container {
background-color: var(--calcite-split-button-divider);
background-color: var(--calcite-internal-split-button-divider);
}
}

@include disabled() {
calcite-dropdown > calcite-button {
@apply pointer-events-none;
}
&:host([appearance="outline-fill"]) .divider-container {
background-color: var(--calcite-color-background);
}
&:host([appearance="outline"]) .divider-container {
background-color: transparent;
}
}

@include base-component();
Loading
Loading