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

Issue# SB-14460 alignments changes in sso screens

src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.html

@@ -5,12 +5,12 @@
       <img src="assets/images/DIKSHA.svg" class="sb-certificatePage-logo" alt="DIKSHA Logo" />
     </div>
     <div class="sb-merged-account-content text-center">
-      <h3 class="sb-merged-account-body-header my-24 font-weight-bold">
+      <h3 class="sb-merged-account-body-header my-24 font-weight-bold f-18">
         {{resourceService.frmelmnts?.lbl?.mergeAccount}}</h3>
-      <p *ngIf="isMergeSuccess" class="sb-merged-account-body-para sb-color-success font-weight-bold py-8">
-        {{resourceService.messages?.imsg?.m0065}} <br>{{resourceService.messages?.imsg?.m0066}}</p>
-      <p *ngIf="!isMergeSuccess" class="sb-merged-account-body-para sb-color-error font-weight-bold py-8">
-        {{resourceService.messages?.imsg?.m0067}} </p>
+        <p *ngIf="isMergeSuccess" class="sb-merged-account-body-para sb-color-success font-weight-bold py-8">
+            {{resourceService.messages?.imsg?.m0065}}. {{resourceService.messages?.imsg?.m0066}}</p>
+          <p *ngIf="!isMergeSuccess" class="sb-merged-account-body-para sb-color-error font-weight-bold py-8">
+            {{resourceService.messages?.imsg?.m0067}} </p>
     </div>
     <div class="d-flex flex-jc-center mt-40">
         <button class="sb-btn sb-btn-secondary sb-btn-md w-100"

src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.scss

-.sb-merged-account-body-header{
-    font-size: 18px;
+
+.sb-merged-account-body-para.sb-color-success{
+    color:#008840;
 }
\ No newline at end of file

src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.html

@@ -5,7 +5,7 @@
       <img src="assets/images/DIKSHA.svg" class="sb-certificatePage-logo" alt="DIKSHA Logo"/>
     </div>
     <div class="sb-merged-account-content text-center">
-      <h3 class="sb-merged-account-body-header my-24 font-weight-bold">
+      <h3 class="sb-merged-account-body-header my-24 font-weight-bold f-18">
         {{resourceService.frmelmnts?.lbl?.mergeAccount}}</h3>
       <p class="py-8 m-0 failed-message font-weight-bold">Could not merge accounts because the password entered is incorrect.
         Click OK to create a new DIKSHA account</p>

src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.scss

 .failed-message{
     color: #e55a28;
 }
-.sb-merged-account-body-header{
-    font-size: 18px;
-}
\ No newline at end of file

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

@@ -7,16 +7,18 @@
     <div class="sb-merged-account-content text-center">
       <h3 class="sb-merged-account-body-header my-24 font-weight-bold">
         {{resourceService.frmelmnts?.lbl?.mergeAccount}}</h3>
-      <p class="py-8 m-0">{{resourceService.messages?.imsg?.m0070 | interpolate:'{instance}': instance }}:</p>
-      <ul class="m-0 sb-list-items">
-        <li class="mb-8">
-          {{resourceService.messages?.imsg?.m0063}}
-        </li>
-        <li class="mb-8">
-          {{resourceService.messages?.imsg?.m0064}}
-        </li>
-      </ul>
-      <p class="">{{resourceService.messages?.imsg?.m0062}} {{resourceService.messages?.imsg?.m0071 | interpolate:'{instance}': instance}}</p>
+    </div>
+    <div class="text-left">
+        <p class="py-8 m-0">{{resourceService.messages?.imsg?.m0070 | interpolate:'{instance}': instance }}:</p>
+        <ul class="m-0 sb-list-items">
+          <li class="mb-8">
+            {{resourceService.messages?.imsg?.m0063}}
+          </li>
+          <li class="mb-8">
+            {{resourceService.messages?.imsg?.m0064}}
+          </li>
+        </ul>
+        <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-md width-100 mr-8 mb-auto"

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

@@ -12,5 +12,6 @@
 .sb-list-items{
   text-align: left;
     list-style-type: initial;
+    padding-left: 16px;
     line-height: normal;
 }
\ No newline at end of file

src/app/client/src/assets/styles/base/_typography.scss

@@ -43,6 +43,9 @@ p {
 .fxsmall {
     font-size: $font-size-xs; // 10px
 }
+.f-18{
+    font-size: 18px;
+}
 .sb-h1-title{
 
 }