Merged in feature/SHIBUI-2609-bootstrap-upgrade (pull request #666)

SHIBUI-2609: upgrade Bootstrap css version Approved-by: Charles Hasegawa
TIER · Sep 21, 2023 · adb3454 · adb3454
2 parents f65b36e + 12a95d9
commit adb3454
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -12,7 +12,7 @@
         "@fortawesome/react-fontawesome": "^0.1.18",
         "@reduxjs/toolkit": "^1.9.0",
         "@rjsf/core": "^4.1.1",
-        "bootstrap": "^5.2.3",
+        "bootstrap": "^5.3.0",
         "date-fns": "^2.28.0",
         "deep-object-diff": "^1.1.7",
         "file-saver": "^2.0.5",

diff --git a/ui/src/theme/project/buttons.scss b/ui/src/theme/project/buttons.scss
@@ -52,6 +52,8 @@ $custom-control-spacer-x: 1rem;
             white-space: normal;
             height: 60px;
 
+            background: var(--bs-btn-bg);
+
             &.previous {
                 $color: map.get($theme-colors, 'secondary');
                 @include button-variant($color, $color);

diff --git a/ui/src/theme/variables.scss b/ui/src/theme/variables.scss
@@ -89,3 +89,7 @@ $fa-font-path: "~font-awesome/fonts";
 $body-bg: $gray-100;
 
 $link-decoration: none;
+
+:root {
+    --bs-tertiary-bg: #e9ecef;
+}