Skip to content

Commit 2f01d5a

Browse files
authored
feat(Bundle): update css bundler (#6804)
* refactor: 增加样式文件 * refactor: 更新忽略文件 * refactor: 更新路径 * refactor: 减少拷贝脚本提高性能 * chore: 更新依赖 * refactor: 精简代码减少 rtl.css * refator: 精简脚本 * refactor: 重构资产文件 * refactor: 精简脚本
1 parent 06c5b30 commit 2f01d5a

File tree

9 files changed

+50
-61
lines changed

9 files changed

+50
-61
lines changed

.gitignore

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,6 @@ src/**/wwwroot/**/uploader
373373
# npm
374374
**/package-lock.json
375375

376-
# sass
377-
**/BootstrapBlazor/wwwroot/css/animate.min.css
378-
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
379-
**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
380-
**/BootstrapBlazor/wwwroot/css/bootstrap.rtl.min.css
381-
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
382-
**/BootstrapBlazor/wwwroot/css/motronic.min.css
383-
**/BootstrapBlazor/wwwroot/css/nano.min.css
384-
385376
# Bootstrap
386377
**/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
378+
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css

src/BootstrapBlazor/BootstrapBlazor.csproj

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<Content Remove="sasscompiler.json" />
14-
<Content Remove="wwwroot\core\**\*.*" />
15-
<Content Remove="wwwroot\lib\**\*.css" />
16-
<Content Remove="wwwroot\scss\**\*.*" />
17-
<Content Remove="wwwroot\src\**\*.*" />
18-
<None Include="sasscompiler.json" />
19-
<None Include="wwwroot\core\**\*.*" />
20-
<None Include="wwwroot\lib\**\*.css" />
21-
<None Include="wwwroot\scss\**\*.*" />
22-
<None Include="wwwroot\src\**\*.*" />
13+
<Content Remove="wwwroot\core\bootstrap\css\bootstrap.css" />
14+
<Content Remove="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
15+
<Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
16+
<Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
17+
<Content Remove="wwwroot\lib\swal\sweetalert2.css" />
18+
<Content Remove="wwwroot\scss\*" />
19+
<None Include="wwwroot\core\bootstrap\css\bootstrap.css" />
20+
<None Include="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
21+
<None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
22+
<None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
23+
<None Include="wwwroot\lib\swal\sweetalert2.css" />
24+
<None Include="wwwroot\scss\*" />
2325
</ItemGroup>
2426

2527
<ItemGroup>

src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const getOrCreatePickr = async (id, picker, options) => {
2525
const { isSupportOpacity } = options;
2626

2727
if (isSupportOpacity === true) {
28-
await addLink("./_content/BootstrapBlazor/css/nano.min.css");
28+
await addLink("./_content/BootstrapBlazor/lib/pickr/nano.min.css");
2929

3030
const { invoke, pickr } = picker;
3131
if (pickr) {

src/BootstrapBlazor/Directory.Build.targets

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@
33
<Import Project="..\..\Version.props" />
44

55
<ItemGroup>
6-
<PackageReference Include="AspNetCore.SassCompiler" Version="1.92.1" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == '$(RunTargetFramework)'" />
6+
<PackageReference Include="AspNetCore.SassCompiler" Version="1.93.2" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == '$(RunTargetFramework)'" />
77
</ItemGroup>
88

9-
<Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(RunTargetFramework)'">
10-
<Message Text="Copy bootstrap assets ..." Importance="high"></Message>
11-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js" SkipUnchangedFiles="true"></Copy>
12-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.min.css" SkipUnchangedFiles="true"></Copy>
13-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.rtl.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.rtl.min.css" SkipUnchangedFiles="true"></Copy>
14-
15-
<Message Text="Copy bootstrapblazor assets ..." Importance="high"></Message>
16-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/animate/animate.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/animate.min.css" SkipUnchangedFiles="true"></Copy>
17-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/swal/sweetalert2.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/sweetalert2.css" SkipUnchangedFiles="true"></Copy>
18-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/pickr/nano.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/nano.min.css" SkipUnchangedFiles="true"></Copy>
9+
<PropertyGroup>
10+
<BootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js</BootstrapBundleFile>
11+
<TargetBootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js</TargetBootstrapBundleFile>
12+
</PropertyGroup>
1913

20-
<Message Text="Copy motronic theme ..." Importance="high"></Message>
21-
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/src/css/motronic.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/motronic.min.css" SkipUnchangedFiles="true"></Copy>
14+
<Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(RunTargetFramework)'">
15+
<Message Text="Copy bootstrap.bundle.min.js ..." Importance="high"></Message>
16+
<Copy SourceFiles="$(BootstrapBundleFile)" DestinationFiles="$(TargetBootstrapBundleFile)" SkipUnchangedFiles="true"></Copy>
2217
</Target>
2318

2419
</Project>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('bootstrap.min.css');
1+
@import url('../core/bootstrap/css/bootstrap.min.css');
22
@import url('bootstrapblazor.min.css');
3-
@import url('animate.min.css');
4-
@import url('sweetalert2.css');
3+
@import url('../lib/animate/animate.min.css');
4+
@import url('../lib/swal/sweetalert2.min.css');
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@import url('bootstrap.rtl.min.css');
1+
@import url('../core/bootstrap/css/bootstrap.rtl.min.css');
22
@import url('bootstrapblazor.min.css');
3-
@import url('rtl.css');
4-
@import url('animate.min.css');
5-
@import url('sweetalert2.css');
3+
@import url('../lib/animate/animate.min.css');
4+
@import url('../lib/swal/sweetalert2.min.css');

src/BootstrapBlazor/wwwroot/css/rtl.css

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/BootstrapBlazor/wwwroot/scss/components.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,25 @@
117117
@use "../../Components/Waterfall/Waterfall.razor.scss";
118118
@use "../../Components/Watermark/Watermark.razor.scss";
119119
@use "./meilisearch.scss";
120+
121+
[dir="rtl"] .card-collapse-bar:not([aria-expanded=true]) > .card-collapse-arrow {
122+
transform: rotate(180deg);
123+
}
124+
125+
[dir="rtl"] .form-select-append {
126+
right: unset;
127+
left: 0;
128+
}
129+
130+
[dir="rtl"] .select .clear-icon {
131+
right: unset;
132+
left: 0;
133+
}
134+
135+
[dir="rtl"] .pagination .page-item:first-child .page-link > i {
136+
transform: rotate(180deg);
137+
}
138+
139+
[dir="rtl"] .pagination .page-item:last-child .page-link > i {
140+
transform: rotate(180deg);
141+
}

0 commit comments

Comments
 (0)