diff --git a/package-lock.json b/package-lock.json index d83076d1..35be8f39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "ng2-charts": "^4.1.1", "ngx-bootstrap": "^10.3.0", "ngx-markdown": "^15.1.2", - "oidc-client-ts": "^2.2.2", + "oidc-client-ts": "^3.1.0", "rxjs": "^7.8.0", "toastify-js": "^1.12.0", "tslib": "^2.1.0", @@ -5044,10 +5044,6 @@ "node": ">= 8" } }, - "node_modules/crypto-js": { - "version": "4.2.0", - "license": "MIT" - }, "node_modules/css-loader": { "version": "6.7.3", "dev": true, @@ -7815,7 +7811,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, "license": "MIT", "dependencies": { @@ -8752,8 +8750,13 @@ "license": "MIT" }, "node_modules/jwt-decode": { - "version": "3.1.2", - "license": "MIT" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz", + "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==", + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/karma": { "version": "6.4.1", @@ -10405,14 +10408,15 @@ "license": "MIT" }, "node_modules/oidc-client-ts": { - "version": "2.2.2", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-3.1.0.tgz", + "integrity": "sha512-IDopEXjiwjkmJLYZo6BTlvwOtnlSniWZkKZoXforC/oLZHC9wkIxd25Kwtmo5yKFMMVcsp3JY6bhcNJqdYk8+g==", "license": "Apache-2.0", "dependencies": { - "crypto-js": "^4.1.1", - "jwt-decode": "^3.1.2" + "jwt-decode": "^4.0.0" }, "engines": { - "node": ">=12.13.0" + "node": ">=18" } }, "node_modules/on-finished": { diff --git a/package.json b/package.json index 685c09c4..b947a0a9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "ng2-charts": "^4.1.1", "ngx-bootstrap": "^10.3.0", "ngx-markdown": "^15.1.2", - "oidc-client-ts": "^2.2.2", + "oidc-client-ts": "^3.1.0", "rxjs": "^7.8.0", "toastify-js": "^1.12.0", "tslib": "^2.1.0", diff --git a/projects/gameboard-mks/src/styles.scss b/projects/gameboard-mks/src/styles.scss index 83cdcb27..84d28abe 100644 --- a/projects/gameboard-mks/src/styles.scss +++ b/projects/gameboard-mks/src/styles.scss @@ -1,6 +1,6 @@ $primary: #181866; $primary-hover: #131398; -$danger: #A41E25; +$danger: #a41e25; $success: #41ad57; $light: #f8f9fa; $gray-200: #333; @@ -11,7 +11,8 @@ $bg-tools: #444; body { background-color: $dark; color: $light; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, + Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 18px; box-sizing: border-box; -webkit-font-smoothing: antialiased; @@ -75,9 +76,11 @@ button { border: none; cursor: default; } + button:hover { - background-color: $primary-hover + background-color: $primary-hover; } + .btn-lg { margin: 8px; padding: 32px; @@ -96,7 +99,8 @@ button:hover { } } app-spinner { - svg path, svg rect { + svg path, + svg rect { fill: $primary; } } @@ -109,12 +113,12 @@ app-spinner { color: $light; } textarea { - background-color: $gray-200; - color: $gray-800; + background-color: $gray-200; + color: $gray-800; } textarea:focus { - background-color: $gray-200; - color: $gray-800; + background-color: $gray-200; + color: $gray-800; } input.form-check-input { background-color: $gray-200; diff --git a/projects/gameboard-ui/src/app/admin/challenge-browser/challenge-browser.component.html b/projects/gameboard-ui/src/app/admin/challenge-browser/challenge-browser.component.html index 89efa34a..f1e93f7e 100644 --- a/projects/gameboard-ui/src/app/admin/challenge-browser/challenge-browser.component.html +++ b/projects/gameboard-ui/src/app/admin/challenge-browser/challenge-browser.component.html @@ -93,7 +93,7 @@

Challenge

diff --git a/projects/gameboard-ui/src/app/admin/components/active-challenges-modal/active-challenges-modal.component.html b/projects/gameboard-ui/src/app/admin/components/active-challenges-modal/active-challenges-modal.component.html index 05fc143c..d8ac41e6 100644 --- a/projects/gameboard-ui/src/app/admin/components/active-challenges-modal/active-challenges-modal.component.html +++ b/projects/gameboard-ui/src/app/admin/components/active-challenges-modal/active-challenges-modal.component.html @@ -106,11 +106,11 @@
-
There aren't any active challenges of this type right now.
+
There aren't any active challenges of this type right now.
-
None of the active challenges match your search.
+
None of the active challenges match your search.
diff --git a/projects/gameboard-ui/src/app/admin/components/active-teams-modal/active-teams-modal.component.html b/projects/gameboard-ui/src/app/admin/components/active-teams-modal/active-teams-modal.component.html index f0211a4e..b7448e46 100644 --- a/projects/gameboard-ui/src/app/admin/components/active-teams-modal/active-teams-modal.component.html +++ b/projects/gameboard-ui/src/app/admin/components/active-teams-modal/active-teams-modal.component.html @@ -104,11 +104,11 @@