Merge pull request #2613 from vinodkumar45/SB-14460_new

Issue #SB-14460 SSO merge UI alignment issues

src/app/client/src/app/modules/shared-feature/components/sso-merge-confirmation/sso-merge-confirmation.component.html

@@ -19,10 +19,10 @@
       <p class="">{{resourceService.messages?.imsg?.m0062}} {{resourceService.messages?.imsg?.m0071 | interpolate:'{instance}': instance}}</p>
     </div>
     <div class="d-flex mt-40">
-      <button class="sb-btn sb-btn-outline-secondary sb-btn-normal width-100 mr-8 mb-auto"
+      <button class="sb-btn sb-btn-outline-secondary sb-btn-md width-100 mr-8 mb-auto"
               (click)="createNewUser()">{{resourceService.frmelmnts?.btn?.cancel}}
       </button>
-      <button class="sb-btn sb-btn-secondary sb-btn-normal width-100 ml-8 mb-auto"
+      <button class="sb-btn sb-btn-secondary sb-btn-md width-100 ml-8 mb-auto"
               (click)="migrateUser()">{{resourceService.frmelmnts?.btn?.merge}}
       </button>
     </div>

src/app/client/src/app/modules/shared-feature/components/sso-merge-confirmation/sso-merge-confirmation.component.scss

@@ -6,8 +6,11 @@
     }
   }
 }
+.sb-merged-account-body-header{	
+  font-size: 18px;	
+}
 .sb-list-items{
   text-align: left;
     list-style-type: initial;
-    line-height: 20px;
+    line-height: normal;
 }
\ No newline at end of file