Skip to content

Commit

Permalink
fix(IconTheme): icon garbled issue (#3428)
Browse files Browse the repository at this point in the history
* refactor: 修复乱码问题

* chore: bump version 8.0.3

* fix: 修复乱码问题

* chore: bump version 8.0.2

* refactor: 更新图标库

* chore: bump version 8.0.3

* feat: upgrade lib to 6.5.2

* chore: bump version 8.0.4

* chore: update bs css file path

* chore: udate icon lib
  • Loading branch information
ArgoZhang authored May 5, 2024
1 parent ed4902a commit 440c80e
Show file tree
Hide file tree
Showing 31 changed files with 430 additions and 32 deletions.
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@
<PackageReference Include="BootstrapBlazor.BarCode" Version="8.0.0" />
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="0.1.1" />
<PackageReference Include="BootstrapBlazor.Bluetooth" Version="8.0.2" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="8.0.1" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="8.0.2" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="8.0.1" />
<PackageReference Include="BootstrapBlazor.Chart" Version="8.1.0" />
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="8.0.0" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="8.0.2" />
<PackageReference Include="BootstrapBlazor.Dock" Version="8.1.3" />
<PackageReference Include="BootstrapBlazor.FileViewer" Version="8.0.1" />
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="8.0.2" />
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="8.0.4" />
<PackageReference Include="BootstrapBlazor.Gantt" Version="8.0.1" />
<PackageReference Include="BootstrapBlazor.Holiday" Version="8.0.1" />
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="8.1.0" />
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="*" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="8.0.0" />
<PackageReference Include="BootstrapBlazor.Markdown" Version="8.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="8.0.2" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="8.0.3" />
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="8.0.4" />
<PackageReference Include="BootstrapBlazor.Middleware" Version="8.0.0" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="8.0.7" />
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<link rel="apple-touch-icon" href="favicon.png">
<Link Href="_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css" />
<Link Href="_content/BootstrapBlazor.MaterialDesign/css/md.min.css" />
<Link Href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap-icons.min.css" />
<Link Href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css" />
<Link Href="_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css" />
<Link Href="_content/BootstrapBlazor/css/motronic.min.css" />
<Link Href="BootstrapBlazor.Server.styles.css" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\Bundle.props" />

<PropertyGroup>
<Version>8.0.1</Version>
<Version>8.0.2</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -14,13 +14,17 @@
<ItemGroup>
<Content Remove="bundleconfig.json" />
<Content Remove="wwwroot\css\bootstrap-icons.css" />
<Content Remove="wwwroot\css\bootstrap-icons.min.css" />
<Content Remove="wwwroot\css\bs.css" />
<Content Remove="wwwroot\css\bs.min.css" />
</ItemGroup>

<ItemGroup>
<None Include="bundleconfig.json" />
<None Include="wwwroot\css\bootstrap-icons.css" />
<None Include="wwwroot\css\bootstrap-icons.min.css" />
<None Include="wwwroot\css\bs.css" />
<None Include="wwwroot\css\bs.min.css" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
[
{
"outputFileName": "wwwroot/css/bootstrap-icons.min.css",
"outputFileName": "wwwroot/css/bs.min.css",
"inputFiles": [
"wwwroot/css/bootstrap-icons.css",
"wwwroot/css/bs.css"
]
},
{
"outputFileName": "wwwroot/css/bootstrap.min.css",
"inputFiles": [
"wwwroot/css/bootstrap-icons.min.css",
"wwwroot/css/bs.min.css"
],
"minify": {
"enabled": false
}
}
]

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\Bundle.props" />

<PropertyGroup>
<Version>8.0.2</Version>
<Version>8.0.4</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
[
{
"outputFileName": "wwwroot/css/font-awesome.min.css",
"outputFileName": "wwwroot/fa/fa-list.min.css",
"inputFiles": [
"wwwroot/fa/*.min.css",
"Components/**/*.css"
]
],
"minify": {
"enabled": true
}
},
{
"outputFileName": "wwwroot/css/font-awesome.min.css",
"inputFiles": [
"wwwroot/fa/*.min.css"
],
"minify": {
"enabled": false
}
}
]

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc.
* Copyright 2024 Fonticons, Inc.
*/
.fa {
font-family: var(--fa-style-family, "Font Awesome 6 Free");
Expand Down Expand Up @@ -463,8 +463,8 @@
transform: scale(-1, -1); }

.fa-rotate-by {
-webkit-transform: rotate(var(--fa-rotate-angle, none));
transform: rotate(var(--fa-rotate-angle, none)); }
-webkit-transform: rotate(var(--fa-rotate-angle, 0));
transform: rotate(var(--fa-rotate-angle, 0)); }

.fa-stack {
display: inline-block;
Expand Down Expand Up @@ -2768,6 +2768,9 @@ readers do not read off random characters that represent icons */
.fa-italic::before {
content: "\f033"; }

.fa-table-cells-column-lock::before {
content: "\e678"; }

.fa-church::before {
content: "\f51d"; }

Expand Down Expand Up @@ -4940,6 +4943,9 @@ readers do not read off random characters that represent icons */
.fa-font::before {
content: "\f031"; }

.fa-table-cells-row-lock::before {
content: "\e67a"; }

.fa-rupiah-sign::before {
content: "\e23d"; }

Expand Down Expand Up @@ -6481,6 +6487,9 @@ readers do not read off random characters that represent icons */
.fa-drupal:before {
content: "\f1a9"; }

.fa-jxl:before {
content: "\e67b"; }

.fa-hire-a-helper:before {
content: "\f3b0"; }

Expand Down Expand Up @@ -6784,6 +6793,9 @@ readers do not read off random characters that represent icons */
.fa-kickstarter:before {
content: "\f3bb"; }

.fa-square-kickstarter:before {
content: "\f3bb"; }

.fa-grav:before {
content: "\f2d6"; }

Expand Down Expand Up @@ -7216,6 +7228,9 @@ readers do not read off random characters that represent icons */
.fa-google-plus-square:before {
content: "\f0d4"; }

.fa-web-awesome:before {
content: "\e682"; }

.fa-mandalorian:before {
content: "\f50f"; }

Expand Down Expand Up @@ -7378,6 +7393,9 @@ readers do not read off random characters that represent icons */
.fa-xbox:before {
content: "\f412"; }

.fa-square-web-awesome-stroke:before {
content: "\e684"; }

.fa-searchengin:before {
content: "\f3eb"; }

Expand Down Expand Up @@ -7486,6 +7504,9 @@ readers do not read off random characters that represent icons */
.fa-whatsapp:before {
content: "\f232"; }

.fa-square-upwork:before {
content: "\e67c"; }

.fa-slideshare:before {
content: "\f1e7"; }

Expand Down Expand Up @@ -7564,6 +7585,9 @@ readers do not read off random characters that represent icons */
.fa-sellsy:before {
content: "\f213"; }

.fa-square-web-awesome:before {
content: "\e683"; }

.fa-sass:before {
content: "\f41e"; }

Expand Down Expand Up @@ -7600,6 +7624,9 @@ readers do not read off random characters that represent icons */
.fa-waze:before {
content: "\f83f"; }

.fa-bluesky:before {
content: "\e671"; }

.fa-cc-jcb:before {
content: "\f24b"; }

Expand Down
Loading

0 comments on commit 440c80e

Please sign in to comment.