Skip to content

Commit 47d2463

Browse files
feat(Swal): upgrade swal v2 style (#5026)
* chore: bump version 9.2.3-beta01 Co-Authored-By: Alex chow <[email protected]> * chore: 更新最新版样式 * feat: 根据最新样式更新 dom 结构 * doc: 更新文档 --------- Co-authored-by: Alex chow <[email protected]>
1 parent 62ade0b commit 47d2463

File tree

7 files changed

+1129
-1590
lines changed

7 files changed

+1129
-1590
lines changed

src/BootstrapBlazor.Server/Components/Samples/SweetAlerts.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ await SwalService.Show(op);</Pre>
6363
<div class="text-warning">@Localizer["SweetAlertsNormalWarn"]</div>
6464
</div>
6565
<div class="col-4">
66-
<div class="swal2-icon swal2-warning"></div>
66+
<div class="swal2-icon swal2-warning"><div class="swal2-icon-content">!</div></div>
6767
</div>
6868
<div class="col-4 align-self-center text-center">
6969
<Button Icon="fa-solid fa-font-awesome" Text="@Localizer["SweetAlertsPopups"]" Color="Color.Warning" OnClick="@(e => OnSwal(SwalCategory.Warning))" />
@@ -74,7 +74,7 @@ await SwalService.Show(op);</Pre>
7474
<div class="text-info">@Localizer["SweetAlertsNormalHint"]</div>
7575
</div>
7676
<div class="col-4">
77-
<div class="swal2-icon swal2-info"></div>
77+
<div class="swal2-icon swal2-info"><div class="swal2-icon-content">i</div></div>
7878
</div>
7979
<div class="col-4 align-self-center text-center">
8080
<Button Icon="fa-solid fa-font-awesome" Text="@Localizer["SweetAlertsPopups"]" Color="Color.Info" OnClick="@(e => OnSwal(SwalCategory.Information))" />
@@ -85,7 +85,7 @@ await SwalService.Show(op);</Pre>
8585
<div class="text-secondary">@Localizer["SweetAlertsNormalDoubt"]</div>
8686
</div>
8787
<div class="col-4">
88-
<div class="swal2-icon swal2-question"></div>
88+
<div class="swal2-icon swal2-question"><div class="swal2-icon-content">?</div></div>
8989
</div>
9090
<div class="col-4 align-self-center text-center">
9191
<Button Icon="fa-solid fa-font-awesome" Text="@Localizer["SweetAlertsPopups"]" Color="Color.Secondary" OnClick="@(e => OnSwal(SwalCategory.Question))" />

src/BootstrapBlazor/BootstrapBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.2.2</Version>
4+
<Version>9.2.3-beta01</Version>
55
</PropertyGroup>
66

77
<ItemGroup>

src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.scss

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,70 @@
44
z-index: var(--bb-swal-zindex);
55
}
66

7+
.swal2-header {
8+
display: flex;
9+
flex-direction: column;
10+
align-items: center;
11+
}
12+
13+
.swal2-icon {
14+
position: relative;
15+
box-sizing: content-box;
16+
justify-content: center;
17+
width: 5em;
18+
height: 5em;
19+
margin: 1.25em auto 1.875em;
20+
zoom: normal;
21+
border: .25em solid transparent;
22+
border-radius: 50%;
23+
line-height: 5em;
24+
cursor: default;
25+
user-select: none;
26+
}
27+
28+
.swal2-title {
29+
position: relative;
30+
max-width: 100%;
31+
margin: 0 0 .4em;
32+
padding: 0;
33+
color: #595959;
34+
font-size: 1.875em;
35+
font-weight: 600;
36+
text-align: center;
37+
text-transform: none;
38+
word-wrap: break-word;
39+
}
40+
41+
.swal2-content {
42+
z-index: 1;
43+
justify-content: center;
44+
margin: 0;
45+
padding: 0;
46+
color: #545454;
47+
font-size: 1.125em;
48+
font-weight: 300;
49+
line-height: normal;
50+
word-wrap: break-word;
51+
}
52+
53+
.swal2-actions {
54+
z-index: 1;
55+
flex-wrap: wrap;
56+
align-items: center;
57+
justify-content: center;
58+
width: 100%;
59+
margin: 1.25em auto 0;
60+
}
61+
62+
.swal2-footer {
63+
justify-content: center;
64+
margin: 1.25em 0 0;
65+
padding: 1em 0 0;
66+
border-top: 1px solid #eee;
67+
color: #545454;
68+
font-size: 1em;
69+
}
70+
771
.swal2-icon,
872
.swal2-actions {
973
display: flex;

src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,23 @@
2020
</span>
2121
</div>
2222
}
23-
else
23+
else if (Category == SwalCategory.Warning)
2424
{
25-
<div class="@IconClassString"></div>
25+
<div class="@IconClassString">
26+
<div class="swal2-icon-content">!</div>
27+
</div>
28+
}
29+
else if (Category == SwalCategory.Question)
30+
{
31+
<div class="@IconClassString">
32+
<div class="swal2-icon-content">?</div>
33+
</div>
34+
}
35+
else if (Category == SwalCategory.Information)
36+
{
37+
<div class="@IconClassString">
38+
<div class="swal2-icon-content">i</div>
39+
</div>
2640
}
2741
@if (!string.IsNullOrEmpty(Title))
2842
{

src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ public partial class SweetAlertBody
126126
[NotNull]
127127
private IIconTheme? IconTheme { get; set; }
128128

129-
private string? IconClassString => CssBuilder.Default("swal2-icon")
130-
.AddClass("swal2-success swal2-animate-success-icon", Category == SwalCategory.Success)
131-
.AddClass("swal2-error swal2-animate-error-icon", Category == SwalCategory.Error)
129+
private string? IconClassString => CssBuilder.Default("swal2-icon swal2-icon-show")
130+
.AddClass("swal2-success", Category == SwalCategory.Success)
131+
.AddClass("swal2-error", Category == SwalCategory.Error)
132132
.AddClass("swal2-info", Category == SwalCategory.Information)
133133
.AddClass("swal2-question", Category == SwalCategory.Question)
134134
.AddClass("swal2-warning", Category == SwalCategory.Warning)

0 commit comments

Comments
 (0)