Fixes #24434: Fix UI issues caused by bootstrap update in user-manage…

…ment plugin
Normation · Mar 13, 2024 · fccdc7a · fccdc7a
1 parent 9416aa3
commit fccdc7a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/...ackends/src/main/scala/com/normation/plugins/authbackends/snippet/Oauth2LoginBanner.scala b/...ackends/src/main/scala/com/normation/plugins/authbackends/snippet/Oauth2LoginBanner.scala
@@ -94,8 +94,8 @@ class Oauth2LoginBanner(
         rgs.map {
           case (id, r) =>
             <div class="form-group">
-             <div class="input-group col-xs-12">
-               <a class="btn btn-warning-rudder col-xs-12" href={redirectUrl(id)} role="button">{
+             <div class="input-group-text col-12">
+               <a class="btn col-12" href={redirectUrl(id)} role="button">{
               s"${r.infoMsg} (${r.registration.getClientName})"
             }</a>
              </div>
@@ -106,8 +106,8 @@ class Oauth2LoginBanner(
       </div>
     } else {
       <div id="oauth2providers">
-        <div class="col-xs-12">
-          <h4 class="welcome col-xs-12">OAUTH2 backend is enabled, but no providers are correctly configured</h4>
+        <div class="col-12">
+          <h4 class="welcome col-12">OAUTH2 backend is enabled, but no providers are correctly configured</h4>
         </div>
       </div>
     }
@@ -130,7 +130,7 @@ class Oauth2LoginBanner(
                                     |   $('#errorInfoSSO').toggle(true);
                                     | }}
                                     |""".stripMargin))) ++
-              <button id="toggleLoginFormButton" class="btn btn-default btn-xs">show non-SSO login form
+              <button id="toggleLoginFormButton" class="btn btn-sm btn-light btn-outline-secondary border">show non-SSO login form
                             </button><div id="toggleLoginForm" style="display: none">{x}</div>
             case LoginFormRendering.Remove => NodeSeq.Empty
           })

diff --git a/user-management/src/main/elm/sources/View.elm b/user-management/src/main/elm/sources/View.elm
@@ -580,7 +580,7 @@ displayUsersConf model u =
             , newUserMenu
             , panel
             ]
-        , div [ class "col-xs-12" ] [ div [ class "row user-list" ] users ]
+        , div [ class "col-xs-12" ] [ div [ class "user-list" ] users ]
         ]
 
 

diff --git a/user-management/src/main/style/user-management.css b/user-management/src/main/style/user-management.css
@@ -39,7 +39,7 @@
 
 #plugin-main .inner-portlet {
   padding: 0 15px;
-  font-family : var(--font-sans);
+  font-family: var(--font-sans);
   font-weight: 400;
   font-size: 14px;
 }
@@ -51,11 +51,10 @@
 }
 
 .user-card {
+  cursor: pointer;
   float: left;
-  width: 49%;
   min-height: 151px;
   margin: 15px 15px 15px 20px;
-  border-line: 2px;
   padding-bottom: 10px;
   border-radius: 8px;
   width: 300px;
@@ -70,10 +69,6 @@
   box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
 }
 
-.user-card-wrapper {
-  cursor: pointer;
-}
-
 .user-card-inner {
   position: relative;
   border-radius: 3px;
@@ -181,7 +176,7 @@ h3 {
   width: 26px;
   height: 26px;
   border-radius: 3px;
-  background-color : #13BEB7;
+  background-color: #13BEB7;
   display: inline-flex;
   align-items: center;
   font-size: 20px;
@@ -487,7 +482,7 @@ h3 {
 
 .addBtn {
   margin: 5px 0 0 10px;
-  background-color : #13BEB7;
+  background-color: #13BEB7;
   color: white;
   padding: 2px;
   font-size: 10;
@@ -608,4 +603,4 @@ h3 {
 
 .panel hr {
   margin-top: 40px;
-}
+}