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

style: [1209] add dark theme styles in popconfirm #1211

Merged
merged 3 commits into from
Dec 3, 2024
Merged

style: [1209] add dark theme styles in popconfirm #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
925cf8f
style: adding dark theme styles in popconfirm
larissa-kamily-brisa Nov 28, 2024
fa77d7e
style: adding dark theme styles in popconfirm
larissa-kamily-brisa Nov 29, 2024
cc6f552
Merge branch 'main' into 1209-style-add-dark-theme-styles-in-popconfirm
larissa-kamily-brisa Dec 2, 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
50 changes: 50 additions & 0 deletions projects/ion/src/lib/alert/_alert.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,61 @@ $default: (
background-color: ion-theme(neutral-2),
text-color: ion-theme(neutral-7),
),
without-background: (
text-color: ion-theme(neutral-7),
),
);

$dark: (
border-radius: 8px,
close-icon-size: 18px,
text: (
font-size: 14px,
font-weight: 400,
line-height: 20px,
font-family: ion-theme(font-family-main),
),
success: (
background-color: ion-theme(positive-1),
border-color: ion-theme(positive-5),
icon-color: ion-theme(positive-7),
close-icon-color: ion-theme(primary-6),
text-color: ion-theme(neutral-7),
),
info: (
background-color: ion-theme(info-1),
border-color: ion-theme(info-6),
icon-color: ion-theme(info-6),
close-icon-color: ion-theme(primary-6),
text-color: ion-theme(neutral-7),
),
warning: (
background-color: ion-theme(warning-1),
border-color: ion-theme(warning-6),
icon-color: ion-theme(warning-6),
close-icon-color: ion-theme(primary-6),
text-color: ion-theme(neutral-7),
),
negative: (
background-color: ion-theme(negative-1),
border-color: ion-theme(negative-6),
icon-color: ion-theme(negative-6),
close-icon-color: ion-theme(primary-6),
text-color: ion-theme(neutral-7),
),
with-description: (
background-color: ion-theme(neutral-2),
text-color: ion-theme(neutral-7),
),
without-background: (
text-color: ion-theme(neutral-1),
),
);

@include register-component(
alert,
(
default: $default,
dark: $dark,
)
);
4 changes: 4 additions & 0 deletions projects/ion/src/lib/alert/alert.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ $statuses: success, info, warning, negative;
&.without-background {
background-color: transparent;
border: none !important;

span {
color: ion-theme(alert-without-background-text-color);
}
}

&.no-radius {
Expand Down
19 changes: 19 additions & 0 deletions projects/ion/src/lib/popconfirm/_popconfirm.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,30 @@ $default: (
line-height: 20px,
color: ion-theme(neutral-7),
),
border-color: ion-theme(neutral-1),
);

$dark: (
background-color: ion-theme(neutral-5),
shadow: 0 0 6px rgba(4, 42, 98, 0.15),
arrow: (
color: ion-theme(neutral-5),
shadow: -2px -2px 4px -2px rgb(4 42 98 / 15%),
),
text: (
font-family: ion-theme(font-family-main),
font-weight: 400,
font-size: 14px,
line-height: 20px,
color: ion-theme(neutral-1),
),
border-color: ion-theme(neutral-3),
);

@include register-component(
popconfirm,
(
default: $default,
dark: $dark,
)
);
4 changes: 4 additions & 0 deletions projects/ion/src/lib/popconfirm/popconfirm.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
right: $right;
transform: rotate(45deg);
box-shadow: ion-theme(popconfirm-arrow-shadow);
border-top: 1px solid ion-theme(popconfirm-border-color);
border-left: 1px solid ion-theme(popconfirm-border-color);
}
}

Expand All @@ -44,6 +46,8 @@

.containter {
z-index: $zIndexMid;
border-radius: spacing(1);
border: 1px solid ion-theme(popconfirm-border-color);
}

.description {
Expand Down
4 changes: 3 additions & 1 deletion projects/ion/src/lib/popover/component/_popover.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
$default: (
background-color: ion-theme(neutral-1),
shadow: 0 0 6px rgba(4, 42, 98, 0.15),
border-color: ion-themes(neutral-2),
header: (
background-color: ion-theme(neutral-2),
close-icon-color: ion-theme(primary-6),
Expand Down Expand Up @@ -35,6 +36,7 @@ $default: (
$dark: (
background-color: ion-theme(neutral-5),
shadow: 0 0 6px rgba(4, 42, 98, 0.15),
border-color: ion-theme(neutral-3),
header: (
background-color: ion-theme(neutral-6),
close-icon-color: ion-theme(primary-3),
Expand All @@ -58,7 +60,7 @@ $dark: (
),
arrow: (
shadow: -2px -2px 4px -2px rgb(4 42 98 / 15%),
header-color: ion-theme(neutral-6),
header-color: ion-theme(neutral-5),
body-color: ion-theme(neutral-6),
),
scrollbar-thumb-color: ion-theme(neutral-2),
Expand Down
5 changes: 5 additions & 0 deletions projects/ion/src/lib/popover/component/popover.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ $arrow-distance-to-border: 16px;
top: $arrowPosition;
left: $left;
transform: rotate($rotate);
border-top: 1px solid ion-theme(popover-border-color);
border-left: 1px solid ion-theme(popover-border-color);
}
}

Expand All @@ -51,6 +53,8 @@ $arrow-distance-to-border: 16px;
bottom: $arrowPosition;
left: $left;
transform: rotate($rotate);
border-top: 1px solid ion-theme(popover-border-color);
border-left: 1px solid ion-theme(popover-border-color);
}
}
}
Expand Down Expand Up @@ -213,6 +217,7 @@ $arrow-distance-to-border: 16px;
border-radius: spacing(1);
box-shadow: ion-theme(popover-shadow);
background-color: ion-theme(popover-background-color);
border: 1px solid ion-theme(popover-border-color);
}

&__header {
Expand Down
Loading