Merge Base/Site style bundles, remove colorbox / maskedinput

serenity-is · Oct 19, 2024 · aa48b73 · aa48b73
1 parent 22921e7
commit aa48b73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/serene/src/Serene.Web/Views/Shared/_LayoutHead.cshtml b/serene/src/Serene.Web/Views/Shared/_LayoutHead.cshtml
@@ -1,4 +1,4 @@
-@inject Serenity.Web.IDynamicScriptManager DynamicScriptManager
+@inject Serenity.Web.IDynamicScriptManager DynamicScriptManager
 <meta charset="utf-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -7,7 +7,6 @@
 <link rel="home" id="ApplicationPath" href="~/" />
 <link rel="icon" type="image/x-icon" href="~/favicon.ico" />
 @Html.StyleBundle("Base")
-@Html.StyleBundle("Site")
 <script type="application/json" id="ScriptCulture">@Html.Raw(Serenity.JSON.Stringify(new ScriptCulture()))</script>
 @Html.ScriptBundle("Base")
 @Html.LocalTextScript("Site")

diff --git a/serene/src/Serene.Web/appsettings.bundles.json b/serene/src/Serene.Web/appsettings.bundles.json
@@ -3,14 +3,10 @@
     "Bundles": {
       "Base": [
         "~/Serenity.Assets/fonts/open-sans/open-sans.css",
-        "~/Serenity.Assets/bootstrap/css/bootstrap.css",
+        "~/Serenity.Assets/bootstrap/css/bootstrap{.rtl}.css",
         "~/Serenity.Assets/line-awesome/css/line-awesome-fa.min.css",
         "~/Serenity.Assets/nprogress/nprogress.css",
         "~/Serenity.Extensions/common-style.css",
-        "~/Serenity.Extensions/index.css"
-      ],
-      "Site": [
-        "~/Serenity.Assets/Content/colorbox/jquery.colorbox.css",
         "~/Serenity.Extensions/common-theme.css",
         "~/Content/site/site.css"
       ],
@@ -29,11 +25,9 @@
         "~/Serenity.Assets/Scripts/jquery-ui.js",
         "~/Serenity.Assets/Scripts/jquery-ui-i18n.js",
         "~/Serenity.Assets/bootstrap/js/bootstrap.bundle.js",
-        "~/Serenity.Assets/Scripts/jquery.colorbox.js",
-        "~/Serenity.Assets/Scripts/jquery.maskedinput.js",
-        "~/Serenity.SleekGrid/index.global.js",
         "~/Serenity.Assets/Scripts/sortable.js",
         "~/Serenity.Assets/mousetrap/mousetrap.js",
+        "~/Serenity.SleekGrid/index.global.js",
         "~/Serenity.Corelib/index.global.js",
         "~/Serenity.Extensions/common-theme.js",
         "~/Serenity.Extensions/index.js",