Merge branch 'main' of github.com:CTFd/core-beta into empty-scoreboard

CTFd · Mar 19, 2024 · 861bc9b · 861bc9b
2 parents 43841af + 9350bf6
commit 861bc9b
Show file tree

Hide file tree

Showing 39 changed files with 106 additions and 111 deletions.
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -44,13 +44,9 @@ blockquote {
  font-size: 50%;
 }
 
-select.form-control {
- height: auto !important;
-}
-
 .form-select {
- background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e")
-  no-repeat right 0.75rem center/8px 10px !important;
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e");
+ background-size: 8px 10px;
 }
 
 // HMM

diff --git a/package.json b/package.json
@@ -13,10 +13,10 @@
  "@ctfdio/ctfd-js": "^0.0.12",
  "@fontsource/lato": "^4.5.3",
  "@fontsource/raleway": "^4.5.3",
- "@fortawesome/fontawesome-free": "6.0.0",
+ "@fortawesome/fontawesome-free": "6.5.1",
  "@popperjs/core": "^2.11.4",
  "alpinejs": "^3.9.1",
- "bootstrap": "^5.1.3",
+ "bootstrap": "^5.3.3",
  "bootstrap-multimodal": "~1.0.4",
  "dayjs": "^1.11.0",
  "echarts": "^5.3.2",

diff --git a/static/assets/challenges.b5389f1f.js → static/assets/challenges.18cf1705.js b/static/assets/challenges.b5389f1f.js → static/assets/challenges.18cf1705.js
diff --git a/static/assets/clipboard.7f2653cd.js → static/assets/clipboard.26bc71b7.js b/static/assets/clipboard.7f2653cd.js → static/assets/clipboard.26bc71b7.js
diff --git a/static/assets/index.697f72c1.js b/static/assets/index.697f72c1.js
diff --git a/static/assets/index.e9d69436.js b/static/assets/index.e9d69436.js
diff --git a/static/assets/index.64dccda5.js → static/assets/index.f8e89c17.js b/static/assets/index.64dccda5.js → static/assets/index.f8e89c17.js
diff --git a/static/assets/main.3095e2ea.css b/static/assets/main.3095e2ea.css
diff --git a/static/assets/main.ce77a91a.css b/static/assets/main.ce77a91a.css
diff --git a/static/assets/notifications.09ea3ab0.js → static/assets/notifications.80759ac5.js b/static/assets/notifications.09ea3ab0.js → static/assets/notifications.80759ac5.js
diff --git a/static/assets/page.e56ddd4d.js b/static/assets/page.e56ddd4d.js
diff --git a/static/assets/page.e90bdb25.js b/static/assets/page.e90bdb25.js
@@ -0,0 +1 @@
+import{C as o,m as d}from"./index.e9d69436.js";window.CTFd=o;window.Alpine=d;d.start();
diff --git a/static/assets/scoreboard.8fb640c2.js → static/assets/scoreboard.ffe44295.js b/static/assets/scoreboard.8fb640c2.js → static/assets/scoreboard.ffe44295.js
diff --git a/static/assets/settings.b3224966.js → static/assets/settings.24da1b21.js b/static/assets/settings.b3224966.js → static/assets/settings.24da1b21.js