FIX Update HTML markup for bootstrap 5

silverstripe · Jan 21, 2025 · ddd7c58 · ddd7c58
1 parent 9fdd93f
commit ddd7c58
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/LoginSession/LoginSession.js b/client/src/components/LoginSession/LoginSession.js
@@ -42,7 +42,7 @@ function LoginSession(props) {
       );
 
     return (
-      <span data-toggle="tooltip" data-placement="top" title={activityTooltip}>
+      <span data-bs-toggle="tooltip" data-placement="top" title={activityTooltip}>
         , {lastActiveStr}
       </span>
     );

diff --git a/package.json b/package.json
@@ -23,8 +23,6 @@
     "core-js": "^3.26.0",
     "moment": "^2.29.4",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "react-redux": "^9.2.0",
     "reactstrap": "^8.9.0",
     "reactstrap-confirm": "^1.3.2",

diff --git a/templates/SilverStripe/SessionManager/FormFields/SessionManagerField_holder.ss b/templates/SilverStripe/SessionManager/FormFields/SessionManagerField_holder.ss
@@ -1,6 +1,6 @@
 <div id="$HolderID" class="form-group field<% if $extraClass %> $extraClass<% end_if %>">
     <% if $Title %>
-        <label for="$ID" id="title-$ID" class="form__field-label">
+        <label for="$ID" id="title-$ID" class="form-label form__field-label">
             $Title
             <% if $TitleLinkHref && $TitleLinkText %>
                 <br><a href="$TitleLinkHref" target="_blank">$TitleLinkText</a>

diff --git a/yarn.lock b/yarn.lock
@@ -6417,14 +6417,6 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-dom@^18.2.0:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
-  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.2"
-
 "react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.3.1:
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
@@ -6493,13 +6485,6 @@ react-transition-group@^3.0.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^18.2.0:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
-  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
 reactstrap-confirm@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/reactstrap-confirm/-/reactstrap-confirm-1.3.2.tgz#89cd7c41f48f36bf33ce783d7d3b78dbb65dd122"