Skip to content

feat(Bundle): update css bundler #6804

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

Merged
merged 9 commits into from
Sep 29, 2025
Merged

feat(Bundle): update css bundler #6804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
336d812
refactor: 增加样式文件
ArgoZhang Sep 28, 2025
09fe9f9
refactor: 更新忽略文件
ArgoZhang Sep 28, 2025
c7da6a0
refactor: 更新路径
ArgoZhang Sep 28, 2025
f37939d
refactor: 减少拷贝脚本提高性能
ArgoZhang Sep 28, 2025
2c88990
chore: 更新依赖
ArgoZhang Sep 29, 2025
a97c6a2
refactor: 精简代码减少 rtl.css
ArgoZhang Sep 29, 2025
6213a2b
refator: 精简脚本
ArgoZhang Sep 29, 2025
5ea6009
refactor: 重构资产文件
ArgoZhang Sep 29, 2025
7ab752a
refactor: 精简脚本
ArgoZhang Sep 29, 2025
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
10 changes: 1 addition & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,14 +373,6 @@ src/**/wwwroot/**/uploader
# npm
**/package-lock.json

# sass
**/BootstrapBlazor/wwwroot/css/animate.min.css
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
**/BootstrapBlazor/wwwroot/css/bootstrap.rtl.min.css
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
**/BootstrapBlazor/wwwroot/css/motronic.min.css
**/BootstrapBlazor/wwwroot/css/nano.min.css

# Bootstrap
**/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
22 changes: 12 additions & 10 deletions src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@
</ItemGroup>

<ItemGroup>
<Content Remove="sasscompiler.json" />
<Content Remove="wwwroot\core\**\*.*" />
<Content Remove="wwwroot\lib\**\*.css" />
<Content Remove="wwwroot\scss\**\*.*" />
<Content Remove="wwwroot\src\**\*.*" />
<None Include="sasscompiler.json" />
<None Include="wwwroot\core\**\*.*" />
<None Include="wwwroot\lib\**\*.css" />
<None Include="wwwroot\scss\**\*.*" />
<None Include="wwwroot\src\**\*.*" />
<Content Remove="wwwroot\core\bootstrap\css\bootstrap.css" />
<Content Remove="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
<Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
<Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
<Content Remove="wwwroot\lib\swal\sweetalert2.css" />
<Content Remove="wwwroot\scss\*" />
<None Include="wwwroot\core\bootstrap\css\bootstrap.css" />
<None Include="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
<None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
<None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
<None Include="wwwroot\lib\swal\sweetalert2.css" />
<None Include="wwwroot\scss\*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const getOrCreatePickr = async (id, picker, options) => {
const { isSupportOpacity } = options;

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

const { invoke, pickr } = picker;
if (pickr) {
Expand Down
21 changes: 8 additions & 13 deletions src/BootstrapBlazor/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,17 @@
<Import Project="..\..\Version.props" />

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

<Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(RunTargetFramework)'">
<Message Text="Copy bootstrap assets ..." Importance="high"></Message>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js" SkipUnchangedFiles="true"></Copy>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.min.css" SkipUnchangedFiles="true"></Copy>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.rtl.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.rtl.min.css" SkipUnchangedFiles="true"></Copy>

<Message Text="Copy bootstrapblazor assets ..." Importance="high"></Message>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/animate/animate.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/animate.min.css" SkipUnchangedFiles="true"></Copy>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/swal/sweetalert2.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/sweetalert2.css" SkipUnchangedFiles="true"></Copy>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/pickr/nano.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/nano.min.css" SkipUnchangedFiles="true"></Copy>
<PropertyGroup>
<BootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js</BootstrapBundleFile>
<TargetBootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js</TargetBootstrapBundleFile>
</PropertyGroup>

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

</Project>
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('bootstrap.min.css');
@import url('../core/bootstrap/css/bootstrap.min.css');
@import url('bootstrapblazor.min.css');
@import url('animate.min.css');
@import url('sweetalert2.css');
@import url('../lib/animate/animate.min.css');
@import url('../lib/swal/sweetalert2.min.css');
7 changes: 3 additions & 4 deletions src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url('bootstrap.rtl.min.css');
@import url('../core/bootstrap/css/bootstrap.rtl.min.css');
@import url('bootstrapblazor.min.css');
@import url('rtl.css');
@import url('animate.min.css');
@import url('sweetalert2.css');
@import url('../lib/animate/animate.min.css');
@import url('../lib/swal/sweetalert2.min.css');
0 ...tstrapBlazor/wwwroot/src/css/motronic.css → ...tstrapBlazor/wwwroot/css/motronic.min.css
View file
Open in desktop
File renamed without changes.
21 changes: 0 additions & 21 deletions src/BootstrapBlazor/wwwroot/css/rtl.css
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions src/BootstrapBlazor/wwwroot/scss/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,25 @@
@use "../../Components/Waterfall/Waterfall.razor.scss";
@use "../../Components/Watermark/Watermark.razor.scss";
@use "./meilisearch.scss";

[dir="rtl"] .card-collapse-bar:not([aria-expanded=true]) > .card-collapse-arrow {
transform: rotate(180deg);
}

[dir="rtl"] .form-select-append {
right: unset;
left: 0;
}

[dir="rtl"] .select .clear-icon {
right: unset;
left: 0;
}

[dir="rtl"] .pagination .page-item:first-child .page-link > i {
transform: rotate(180deg);
}

[dir="rtl"] .pagination .page-item:last-child .page-link > i {
transform: rotate(180deg);
}
Loading