Skip to content

Commit fa66803

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 783f1b2 + 97a52b0 commit fa66803

File tree

2 files changed

+77
-67
lines changed

2 files changed

+77
-67
lines changed

packages/lib/src/alert/alert.wc.pcss

Lines changed: 68 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,84 @@
11
.jp-alert {
2-
position: fixed;
3-
bottom: 2rem;
4-
left: 50%;
5-
transform: translateX(-50%);
2+
position: fixed;
3+
bottom: 2rem;
4+
left: 50%;
5+
transform: translateX(-50%);
6+
display: flex;
7+
flex-wrap: wrap;
8+
background-color: var(--background-primary);
9+
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.08);
10+
border-radius: 0.25rem;
11+
max-width: 40rem;
12+
width: 100%;
13+
z-index: 10000;
14+
15+
&-content {
16+
flex: 1 1 0;
617
display: flex;
7-
flex-wrap: wrap;
8-
background-color: white;
9-
box-shadow: 0 2px 6px rgba(0,0,0,.08);
10-
border-radius: .25rem;
11-
max-width: 40rem;
12-
width: 100%;
18+
flex-direction: column;
19+
gap: 0.5rem;
20+
padding: 1rem;
1321

14-
&-content {
15-
flex: 1 1 0;
16-
display: flex;
17-
flex-direction: column;
18-
gap: .5rem;
19-
padding: 1rem;
22+
&-title {
23+
font-size: 1.5rem;
24+
}
25+
}
2026

21-
&-title {
22-
font-size: 1.5rem;
23-
}
24-
&-message {
25-
}
27+
&-close {
28+
padding: 0.5rem;
29+
&-button {
30+
display: flex;
31+
justify-content: center;
32+
align-items: center;
33+
width: 0.75rem;
34+
height: 0.75rem;
35+
border: none;
36+
padding: 0;
37+
cursor: pointer;
38+
background-color: transparent;
2639
}
40+
}
2741

28-
&-close {
29-
padding: .5rem;
30-
&-button {
31-
display: flex;
32-
justify-content: center;
33-
align-items: center;
34-
width: .75rem;
35-
height: .75rem;
36-
border: none;
37-
padding: 0;
38-
cursor: pointer;
39-
background-color: transparent;
40-
}
42+
&-progress {
43+
width: 100%;
44+
&-bar {
45+
animation: fill-bar 5s linear;
46+
height: 3px;
47+
background-color: var(--secondary-color);
4148
}
49+
}
4250

43-
&-progress {
44-
width: 100%;
45-
&-bar {
46-
animation: fill-bar 5s linear;
47-
height: 3px;
48-
background-color: var(--basic-c);
49-
}
51+
&-warning {
52+
.jp-alert-progress-bar {
53+
background-color: var(--warning-color);
5054
}
5155

52-
&-warning {
53-
.jp-alert-progress-bar {
54-
background-color: var(--warning-c);
55-
}
56+
.jp-alert-content-title,
57+
.jp-alert-content-message {
58+
color: var(--warning-color);
59+
}
60+
}
61+
&-success {
62+
.jp-alert-progress-bar {
63+
background-color: var(--success-color);
5664
}
57-
&-success {
58-
.jp-alert-progress-bar {
59-
background-color: var(--success-c);
60-
}
65+
66+
.jp-alert-content-title,
67+
.jp-alert-content-message {
68+
color: var(--success-color);
6169
}
70+
}
6271
}
6372

6473
@keyframes fill-bar {
65-
from {
66-
width: 0;
67-
}
68-
to {
69-
width: 100%;
70-
}
74+
from {
75+
width: 0;
76+
}
77+
to {
78+
width: 100%;
79+
}
80+
}
81+
82+
@media (max-width: 700px) {
83+
max-width: calc(100vw - 2rem);
7184
}

packages/lib/src/alert/alert.wc.svelte

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
export let title = '';
1414
export let message = '';
1515
export let state: 'success' | 'error' | '' = '';
16-
export let successColor = '#3a8c3d';
17-
export let warningColor = '#f44336';
18-
export let basicColor = '#ABABAB';
1916
2017
const dispatch = createEventDispatcher();
2118
@@ -28,7 +25,7 @@
2825
});
2926
</script>
3027

31-
<div class="jp-alert jp-alert-{state}" style="--success-c: {successColor}; --warning-c: {warningColor}; --basic-c: {basicColor}">
28+
<div class="jp-alert jp-alert-{state}">
3229
<div class="jp-alert-content">
3330
{#if title}
3431
<div class="jp-alert-content-title">{@html title}</div>
@@ -39,18 +36,18 @@
3936
</div>
4037
<div class="jp-alert-close">
4138
<button
42-
type="button"
43-
class="jp-alert-close-button"
44-
on:click={(event) => {
45-
event.preventDefault();
46-
event.stopImmediatePropagation();
47-
dispatch('close');
48-
}}
39+
type="button"
40+
class="jp-alert-close-button"
41+
on:click={(event) => {
42+
event.preventDefault();
43+
event.stopImmediatePropagation();
44+
dispatch('close');
45+
}}
4946
>
5047
{@html clearIcon}
5148
</button>
5249
</div>
5350
<div class="jp-alert-progress">
5451
<div class="jp-alert-progress-bar"></div>
5552
</div>
56-
</div>
53+
</div>

0 commit comments

Comments
 (0)