Merge branch 'main' into nicer-error-hnadling

diff --git a/package.json b/package.json
index 8ad258d8cb3a3c0890ed5bcc5e09b31d53d4a4bb..e24f602d01a5bf921216d0eaae934ae5162fed19 100644 (file)
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
   "devDependencies": {
     "@babel/core": "^7.21.8",
     "@types/autosize": "^4.0.0",
+    "@types/bootstrap": "^5.2.6",
     "@types/express": "^4.17.17",
     "@types/html-to-text": "^9.0.0",
     "@types/markdown-it": "^12.2.3",

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 9cff2c7f5eb0286ca653194af8fbef49c929091a..a0d723940c9d0a136e40aa26df49676bd86f4343 100644 (file)
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -1,7 +1,3 @@
-.navbar-toggler {
-  border: 0px;
-}
-
 .navbar-expand-lg .navbar-nav .nav-link {
   padding-right: 0.75rem !important;
   padding-left: 0.75rem !important;
@@ -201,14 +197,6 @@
   }
 }
 
-.dropdown-content {
-  position: absolute;
-  background-color: var(--light);
-  min-width: 160px;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-  z-index: 2000;
-}
-
 blockquote {
   border-left: 2px solid var(--secondary);
   margin: 0.5em 5px;

diff --git a/src/client/index.tsx b/src/client/index.tsx
index d3a5b625b1212fc44bf4343eee42ef6f596da2f0..99f12371a10a4205f1ec95084d969619b013e2eb 100644 (file)
--- a/src/client/index.tsx
+++ b/src/client/index.tsx
@@ -3,6 +3,7 @@ import { BrowserRouter } from "inferno-router";
 import { App } from "../shared/components/app/app";
 import { initializeSite } from "../shared/utils";
 
+import "bootstrap/js/dist/collapse";
 import "bootstrap/js/dist/dropdown";
 
 const site = window.isoData.site_res;

diff --git a/src/shared/components/app/navbar.tsx b/src/shared/components/app/navbar.tsx
index d92ec259443f144987968190c81e3d56514a030f..d508c4abae7db2d9085a9eb2332aa9084b8f4aea 100644 (file)
--- a/src/shared/components/app/navbar.tsx
+++ b/src/shared/components/app/navbar.tsx
@@ -612,4 +612,4 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
       });
     }
   }
-}
+}
\ No newline at end of file

diff --git a/yarn.lock b/yarn.lock
index 7c2a7124c35eddb2c50f0725c19b8c9209c05e20..7bd1fe2a2bece7058e98e5b6990a14ec5afa4291 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -1155,7 +1155,7 @@
     picocolors "^1.0.0"
     tslib "^2.5.0"
 
-"@popperjs/core@^2.9.0":
+"@popperjs/core@^2.9.0", "@popperjs/core@^2.9.2":
   version "2.11.7"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.7.tgz#ccab5c8f7dc557a52ca3288c10075c9ccd37fff7"
   integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==
@@ -1235,6 +1235,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/bootstrap@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@types/bootstrap/-/bootstrap-5.2.6.tgz#e861b3aa1f4a1434da0bf50fbaa372b6f7e64d2f"
+  integrity sha512-BlAc3YATdasbHoxMoBWODrSF6qwQO/E9X8wVxCCSa6rWjnaZfpkr2N6pUMCY6jj2+wf0muUtLySbvU9etX6YqA==
+  dependencies:
+    "@popperjs/core" "^2.9.2"
+
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41"