Skip to content
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.

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

chore(Minifiler): remove Bundler&Minifiler dependence #3871

Merged
merged 23 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,8 @@ src/**/wwwroot/**/uploader
# sass
**/BootstrapBlazor/wwwroot/scss/theme/*.css
**/BootstrapBlazor/wwwroot/scss/theme/*.css.map
**/BootstrapBlazor/wwwroot/css/*.css
**/BootstrapBlazor/wwwroot/css/animate.min.css
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
**/BootstrapBlazor/wwwroot/css/motronic.min.css
9 changes: 1 addition & 8 deletions src/BootstrapBlazor.Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@
<BlazorReconnector @rendermode="new InteractiveServerRenderMode(false)" />

<script src="_content/BootstrapBlazor.SummerNote/js/jquery-3.5.1.min.js"></script>
@if (Env.IsDevelopment())
{
<Script Src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.js"></Script>
}
@if (Env.IsProduction())
{
<Script Src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></Script>
}
<Script Src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></Script>
<script src="_framework/blazor.web.js"></script>
@if (Env.IsProduction())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
Name="RowTemplate">
<section ignore>@((MarkupString)Localizer["RowTemplateDesc"].Value)</section>

<Table TItem="Foo" IsPagination="true" PageItemsSource="@PageItemsSource"
<Table TItem="Foo" IsPagination="true" PageItemsSource="@PageItemsSource" class="table-row-template"
IsStriped="true" IsBordered="true"
OnQueryAsync="@OnQueryAsync">
<TableColumns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
background-color: #409eff;
color: #fff;
}

::deep + .table-row-template td:has(.datetime-picker) {
padding: 1px;
}
8 changes: 4 additions & 4 deletions src/BootstrapBlazor.Server/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

#if DEBUG
#else
builder.Services.AddResponseCompression(options =>
{
options.EnableForHttps = true;
});
builder.Services.AddResponseCompression(options =>
{
options.EnableForHttps = true;
});
#endif

builder.Services.AddControllers();
Expand Down
7 changes: 0 additions & 7 deletions src/BootstrapBlazor.Server/wwwroot/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,3 @@ code {
--bd-callout-code-color: #e685b5;
--bd-pre-bg: #1b1f22;
}

@supports not selector(::-webkit-scrollbar) {
.scroll {
scrollbar-color: rgba(0,0,0,0.3) rgba(0,0,0,0);
scrollbar-width: thin;
}
}
11 changes: 3 additions & 8 deletions src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>8.7.3-beta02</Version>
<Version>8.7.3-beta03</Version>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
Expand Down Expand Up @@ -54,22 +54,17 @@
<Content Remove="versionconfig.json" />
<Content Remove="wwwroot\core\**\*.*" />
<Content Remove="wwwroot\lib\**\*.css" />
<Content Remove="wwwroot\scss\*.*" />
<Content Remove="wwwroot\scss\**\*.*" />
<Content Remove="wwwroot\src\**\*.*" />
<None Include="bundleconfig.json" />
<None Include="sasscompiler.json" />
<None Include="versionconfig.json" />
<None Include="wwwroot\core\**\*.*" />
<None Include="wwwroot\lib\**\*.css" />
<None Include="wwwroot\scss\*" />
<None Include="wwwroot\scss\**\*.*" />
<None Include="wwwroot\src\**\*.*" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Content Remove="wwwroot\js\bootstrap.blazor.bundle.js" />
<None Include="wwwroot\js\bootstrap.blazor.bundle.js" />
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components" />
<Using Include="Microsoft.AspNetCore.Components" />
Expand Down
7 changes: 7 additions & 0 deletions src/BootstrapBlazor/Components/Scroll/Scroll.razor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,10 @@
}
}
}

@supports not selector(::-webkit-scrollbar) {
.scroll {
scrollbar-color: rgba(0,0,0,0.3) rgba(0,0,0,0);
scrollbar-width: thin;
}
}
13 changes: 10 additions & 3 deletions src/BootstrapBlazor/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
<Project>

<Target Name="BeforeBuild" BeforeTargets="Build" Condition="'$(TargetFramework)' == 'net8.0'">
<Message Text="Copy bootstrap script files ..." Importance="high"></Message>
<Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.js" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.js" SkipUnchangedFiles="true" ></Copy>
<Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net8.0'">
<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>

<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>

<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>

</Project>
12 changes: 3 additions & 9 deletions src/BootstrapBlazor/sasscompiler.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"SourceFolder": "wwwroot/scss/theme",
"TargetFolder": "wwwroot/scss/theme",
"Source": "wwwroot/scss/theme/bootstrapblazor.scss",
"Target": "wwwroot/css/bootstrapblazor.min.css",
"Arguments": "--style=compressed --no-source-map",
"GenerateScopedCss": false,
"IncludePaths": [],
"Configurations": {
"Debug": {
"Arguments": "--style=expanded --no-source-map"
}
}
"GenerateScopedCss": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import url('bootstrap.min.css');
@import url('bootstrapblazor.min.css');
@import url('animate.min.css');
@import url('sweetalert2.css');
Loading