Merge pull request #65 from damienbod/dev9

.NET 9 CSS styles
damienbod · Dec 21, 2024 · cc57c82 · cc57c82
2 parents eebee31 + a9584b5
commit cc57c82
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 104 deletions.
diff --git a/AspNetCoreIdentityFido2Mfa/Pages/Shared/_Layout.cshtml b/AspNetCoreIdentityFido2Mfa/Pages/Shared/_Layout.cshtml
@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="~/css/site.css" />
     <link rel="stylesheet" href="~/css/vendor.min.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/css/fontawesome-free-5.4.1-web/css/all.min.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/AspNetCoreIdentityFido2Mfa.styles.css" asp-append-version="true" />
 </head>
 <body>
     <header>

diff --git a/AspNetCoreIdentityFido2Mfa/Pages/Shared/_Layout.cshtml.css b/AspNetCoreIdentityFido2Mfa/Pages/Shared/_Layout.cshtml.css
@@ -1,4 +1,4 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
 for details on configuring this project to bundle and minify static web assets. */
 
 a.navbar-brand {

diff --git a/AspNetCoreIdentityFido2Mfa/bundleconfig.json b/AspNetCoreIdentityFido2Mfa/bundleconfig.json
@@ -7,7 +7,7 @@
     "inputFiles": [
       "wwwroot/css/site.css"
     ],
-    "minify": { "enabled": true }
+    "minify": { "enabled": false }
   },
   {
     "outputFileName": "wwwroot/js/site.min.js",
@@ -41,7 +41,7 @@
     ],
     "minify": {
       "enabled": false,
-      "renameLocals": true
+      "renameLocals": false
     },
     "sourceMap": false
   },
@@ -55,8 +55,8 @@
       "node_modules/jquery-ajax-unobtrusive/dist/jquery.unobtrusive-ajax.min.js"
     ],
     "minify": {
-      "enabled": true,
-      "renameLocals": true
+      "enabled": false,
+      "renameLocals": false
     },
     "sourceMap": false
   }

diff --git a/AspNetCoreIdentityFido2Mfa/package-lock.json b/AspNetCoreIdentityFido2Mfa/package-lock.json
diff --git a/AspNetCoreIdentityFido2Mfa/package.json b/AspNetCoreIdentityFido2Mfa/package.json
@@ -3,10 +3,10 @@
   "name": "asp.net",
   "private": true,
   "devDependencies": {
-    "bootstrap": "4.6.0",
-    "jquery": "3.6.3",
+    "bootstrap": "5.3.3",
+    "jquery": "3.7.1",
     "jquery-ajax-unobtrusive": "3.2.6",
-    "jquery-validation": "1.19.5",
+    "jquery-validation": "1.21.0",
     "jquery-validation-unobtrusive": "4.0.0",
     "popper.js": "^1.16.1",
     "sweetalert2": "^11.6.16"

diff --git a/AspNetCoreIdentityFido2Mfa/wwwroot/css/site.min.css b/AspNetCoreIdentityFido2Mfa/wwwroot/css/site.min.css
@@ -1 +1,18 @@
-html{font-size:14px}@media(min-width:768px){html{font-size:16px}}html{position:relative;min-height:100%}body{margin-bottom:60px}
+html {
+  font-size: 14px;
+}
+
+@media (min-width: 768px) {
+  html {
+    font-size: 16px;
+  }
+}
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 60px;
+}
diff --git a/AspNetCoreIdentityFido2Mfa/wwwroot/css/vendor.min.css b/AspNetCoreIdentityFido2Mfa/wwwroot/css/vendor.min.css
diff --git a/AspNetCoreIdentityFido2Mfa/wwwroot/js/vendor-validation.min.js b/AspNetCoreIdentityFido2Mfa/wwwroot/js/vendor-validation.min.js
diff --git a/AspNetCoreIdentityFido2Mfa/wwwroot/js/vendor.min.js b/AspNetCoreIdentityFido2Mfa/wwwroot/js/vendor.min.js
diff --git a/AspNetCoreIdentityFido2Passwordless/Pages/Shared/_Layout.cshtml b/AspNetCoreIdentityFido2Passwordless/Pages/Shared/_Layout.cshtml
@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="~/css/site.min.css" />
     <link rel="stylesheet" href="~/css/vendor.min.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/css/fontawesome-free-5.4.1-web/css/all.min.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/AspNetCoreIdentityFido2Passwordless.styles.css" asp-append-version="true" />
 </head>
 <body>
     <header>

diff --git a/AspNetCoreIdentityFido2Passwordless/Pages/Shared/_Layout.cshtml.css b/AspNetCoreIdentityFido2Passwordless/Pages/Shared/_Layout.cshtml.css
@@ -0,0 +1,48 @@
+/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+a {
+  color: #0077cc;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px;
+}
diff --git a/AspNetCoreIdentityFido2Passwordless/bundleconfig.json b/AspNetCoreIdentityFido2Passwordless/bundleconfig.json
@@ -17,7 +17,7 @@
     // Optionally specify minification options
     "minify": {
       "enabled": true,
-      "renameLocals": true
+      "renameLocals": false
     },
     // Optinally generate .map file
     "sourceMap": false
@@ -29,7 +29,7 @@
       "node_modules/bootstrap/dist/css/bootstrap.min.css",
       "node_modules/sweetalert2/dist/sweetalert2.min.css"
     ],
-    "minify": { "enabled": true }
+    "minify": { "enabled": false }
   },
   // Vendor JS
   {
@@ -41,7 +41,7 @@
     ],
     "minify": {
       "enabled": false,
-      "renameLocals": true
+      "renameLocals": false
     },
     "sourceMap": false
   },
@@ -55,8 +55,8 @@
       "node_modules/jquery-ajax-unobtrusive/dist/jquery.unobtrusive-ajax.min.js"
     ],
     "minify": {
-      "enabled": true,
-      "renameLocals": true
+      "enabled": false,
+      "renameLocals": false
     },
     "sourceMap": false
   }