Merge pull request #854 from poppastring/align-bootstrap-5.3.3

Align Bootswatch swatches to Bootstrap 5.3.3 and modernize libman.json

Author: poppastring

source/DasBlog.Web/Themes/darkly/_Layout.cshtml

@@ -19,12 +19,12 @@
     <open-graph />
     <blog-posting-schema />
 
-    @* Darkly is a Bootswatch 5.3.8 swatch (https://bootswatch.com/darkly/).
-       The full Bootstrap + Darkly palette ships from ~/lib/bootswatch/5.3.8/darkly/,
+    @* Darkly is a Bootswatch 5.3.3 swatch (https://bootswatch.com/darkly/).
+       The full Bootstrap + Darkly palette ships from ~/lib/bootswatch/5.3.3/darkly/,
        and the small DasBlog-specific overrides come from ~/Themes/darkly/custom.css
        loaded by _HtmlThemePartial. *@
 
-    <link rel="stylesheet" href="~/lib/bootswatch/5.3.8/darkly/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/lib/bootswatch/5.3.3/darkly/bootstrap.min.css" />
     <link rel="stylesheet" href="~/lib/font-awesome/6.7.2/css/all.css" />
 
     <partial name="_HtmlThemePartial" />

source/DasBlog.Web/Themes/darkly/custom.css

@@ -1,6 +1,6 @@
-/* DasBlog darkly theme local overrides — layered on top of Bootswatch 5.3.8 Darkly,
+/* DasBlog darkly theme local overrides — layered on top of Bootswatch 5.3.3 Darkly,
    which is linked separately from _Layout.cshtml as
-   ~/lib/bootswatch/5.3.8/darkly/bootstrap.min.css. */
+   ~/lib/bootswatch/5.3.3/darkly/bootstrap.min.css. */
 body {
     /*    padding-top: 50px; */
     padding-bottom: 20px;

source/DasBlog.Web/Themes/flatly/_Layout.cshtml

@@ -19,12 +19,12 @@
     <open-graph />
     <blog-posting-schema />
 
-    @* Flatly is a Bootswatch 5.3.8 Flatly swatch (https://bootswatch.com/flatly/).
-       The full Bootstrap + Flatly palette ships from ~/lib/bootswatch/5.3.8/flatly/,
+    @* Flatly is a Bootswatch 5.3.3 Flatly swatch (https://bootswatch.com/flatly/).
+       The full Bootstrap + Flatly palette ships from ~/lib/bootswatch/5.3.3/flatly/,
        and the small DasBlog-specific overrides come from ~/Themes/flatly/custom.css
        loaded by _HtmlThemePartial. *@
 
-    <link rel="stylesheet" href="~/lib/bootswatch/5.3.8/flatly/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/lib/bootswatch/5.3.3/flatly/bootstrap.min.css" />
     <link rel="stylesheet" href="~/lib/font-awesome/6.7.2/css/all.css" />
 
     <partial name="_HtmlThemePartial" />

source/DasBlog.Web/Themes/flatly/custom.css

@@ -1,6 +1,6 @@
-/* DasBlog flatly theme local overrides — layered on top of Bootswatch 5.3.8 Flatly,
+/* DasBlog flatly theme local overrides — layered on top of Bootswatch 5.3.3 Flatly,
    which is linked separately from _Layout.cshtml as
-   ~/lib/bootswatch/5.3.8/flatly/bootstrap.min.css.
+   ~/lib/bootswatch/5.3.3/flatly/bootstrap.min.css.
 
    Bootswatch Flatly's stock link/accent color is green (#18bc9c). We prefer
    Flatly's blue palette — navy primary (#2c3e50) for headings and a brighter

source/DasBlog.Web/libman.json

@@ -4,13 +4,22 @@
   "libraries": [
     {
       "provider": "cdnjs",
-      "library": "twitter-bootstrap@3.3.7",
-      "destination": "wwwroot/lib/bootstrap/dist"
+      "library": "twitter-bootstrap@5.3.3",
+      "destination": "wwwroot/lib/bootstrap/5.3.3/"
     },
     {
       "provider": "cdnjs",
-      "library": "jquery@2.2.0",
-      "destination": "wwwroot/lib/jquery/dist/"
+      "library": "bootswatch@5.3.3",
+      "destination": "wwwroot/lib/bootswatch/5.3.3/",
+      "files": [
+        "darkly/bootstrap.min.css",
+        "flatly/bootstrap.min.css"
+      ]
+    },
+    {
+      "provider": "cdnjs",
+      "library": "jquery@3.5.1",
+      "destination": "wwwroot/lib/jquery/3.5.1/"
     },
     {
       "provider": "cdnjs",
@@ -19,14 +28,19 @@
     },
     {
       "provider": "cdnjs",
-      "library": "jquery-validate@1.14.0",
+      "library": "jquery-validate@1.19.5",
       "destination": "wwwroot/lib/jquery-validation/dist/",
       "files": [
         "jquery.validate.min.js",
         "jquery.validate.js",
         "additional-methods.min.js",
         "additional-methods.js"
       ]
+    },
+    {
+      "provider": "cdnjs",
+      "library": "font-awesome@6.7.2",
+      "destination": "wwwroot/lib/font-awesome/6.7.2/"
     }
   ]
-}
+}