diff --git a/.gitignore b/.gitignore index e2c5b7bbd01..af462e33ff0 100644 --- a/.gitignore +++ b/.gitignore @@ -376,3 +376,6 @@ src/**/wwwroot/**/uploader # Bootstrap **/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js **/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css + +# css +**/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.*.css diff --git a/dotnet-tools.json b/dotnet-tools.json new file mode 100644 index 00000000000..5aab126e04d --- /dev/null +++ b/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "bootstrapblazor.cssbundler": { + "version": "1.0.0", + "commands": [ + "css-bundler" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index e778db50e0a..ea859fd4999 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.11.1-beta04 + 9.11.1-beta05 @@ -10,18 +10,16 @@ - - - - - + + + - - - - - + + + + + diff --git a/src/BootstrapBlazor/Directory.Build.targets b/src/BootstrapBlazor/Directory.Build.targets index d6f187ae6d9..19f16e932f0 100644 --- a/src/BootstrapBlazor/Directory.Build.targets +++ b/src/BootstrapBlazor/Directory.Build.targets @@ -7,13 +7,21 @@ - $(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js - $(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js + $(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js + $(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js + $(MSBuildThisFileDirectory)wwwroot/css/bootstrapblazor.min.css + $(MSBuildThisFileDirectory)wwwroot/css/bootstrap.blazor.bundle.min.css;$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.blazor.bundle.rtl.min.css - + - + + + + + + + diff --git a/src/BootstrapBlazor/bundler.json b/src/BootstrapBlazor/bundler.json new file mode 100644 index 00000000000..5ea407ab453 --- /dev/null +++ b/src/BootstrapBlazor/bundler.json @@ -0,0 +1,20 @@ +[ + { + "outputFileName": "wwwroot/css/bootstrap.blazor.bundle.min.css", + "inputFiles": [ + "wwwroot/core/bootstrap/css/bootstrap.min.css", + "wwwroot/css/bootstrapblazor.min.css", + "wwwroot/lib/animate/animate.min.css", + "wwwroot/lib/swal/sweetalert2.min.css" + ] + }, + { + "outputFileName": "wwwroot/css/bootstrap.blazor.bundle.rtl.min.css", + "inputFiles": [ + "wwwroot/core/bootstrap/css/bootstrap.rtl.min.css", + "wwwroot/css/bootstrapblazor.min.css", + "wwwroot/lib/animate/animate.min.css", + "wwwroot/lib/swal/sweetalert2.min.css" + ] + } +] diff --git a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css deleted file mode 100644 index b810310a384..00000000000 --- a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url('../core/bootstrap/css/bootstrap.min.css'); -@import url('bootstrapblazor.min.css'); -@import url('../lib/animate/animate.min.css'); -@import url('../lib/swal/sweetalert2.min.css'); diff --git a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css deleted file mode 100644 index b29bc12df10..00000000000 --- a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url('../core/bootstrap/css/bootstrap.rtl.min.css'); -@import url('bootstrapblazor.min.css'); -@import url('../lib/animate/animate.min.css'); -@import url('../lib/swal/sweetalert2.min.css');