Merge pull request #390 from jsonBackup/update/bootstrap

Port #389 to MORYX 8
PHOENIXCONTACT · Mar 5, 2024 · 75f1ea7 · 75f1ea7
2 parents 5bc9b06 + a77e9c7
commit 75f1ea7
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 291 deletions.
diff --git a/src/Moryx.CommandCenter.Web/package.json b/src/Moryx.CommandCenter.Web/package.json
@@ -18,7 +18,7 @@
         "@types/react-dom": "^18.2.19",
         "@types/react-redux": "^7.1.33",
         "@types/uuid": "^9.0.8",
-        "bootstrap": "4.6.2",
+        "bootstrap": "5.3.3",
         "bootstrap5-toggle": "^5.0.6",
         "moment": "^2.30.1",
         "query-string": "^8.2.0",
@@ -30,7 +30,7 @@
         "react-router-dom": "^6.22.0",
         "react-router-redux": "^4.0.8",
         "react-toastify": "^10.0.4",
-        "reactstrap": "^8.10.1",
+        "reactstrap": "^9.2.2",
         "redux": "^5.0.1",
         "ts-loader": "^9.5.1",
         "uuid": "^9.0.1"

diff --git a/src/Moryx.CommandCenter.Web/src/common/components/ModuleHeader.tsx b/src/Moryx.CommandCenter.Web/src/common/components/ModuleHeader.tsx
@@ -45,7 +45,7 @@ export class ModuleHeader extends React.Component<ModulePropModel & ModuleDispat
 
     public render(): React.ReactNode {
         return (
-            <Navbar className="navbar-default" expand="md">
+            <Navbar className="navbar-default" expand="md" container={false}>
                 <Nav className="navbar-left" navbar={true}>
                     <NavItem>
                         <NavLink end={true} to={`/modules/${this.props.ModuleName}`} className="navbar-nav-link">

diff --git a/src/Moryx.CommandCenter.Web/src/common/scss/Form.scss b/src/Moryx.CommandCenter.Web/src/common/scss/Form.scss
@@ -4,6 +4,12 @@
     height: 1.95rem !important;
 }
 
+.form-control,
+.form-select {
+    border: 1px solid #ced4da;
+    color: #495057;
+}
+
 .log-menu {
     padding: 0px;
 }
@@ -12,7 +18,7 @@
     -webkit-appearance: none;
     -moz-appearance: none;
     appearance: none;
-    border:none;
+    border: none;
     border-radius: 0;
     font-size: 1em;
     background-repeat: no-repeat;

diff --git a/src/Moryx.CommandCenter.Web/src/common/scss/Menu.scss b/src/Moryx.CommandCenter.Web/src/common/scss/Menu.scss
@@ -4,8 +4,11 @@
     cursor: pointer;
     line-height: 1.15;
     font-size: 11pt;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.125);
     border-left: 0px;
     border-right: 0px;
+    border-top: 0px;
+    padding: .75rem 1.25rem;
 }
 
 .menu-item:hover {
@@ -14,6 +17,7 @@
 
 .menu-item a {
     color: $black;
+    text-decoration: none;
 }
 
 .menu-item a:hover {