Merge pull request #422 from sunbird-cb/logout

Logout page changes
sunbird-cb · May 25, 2022 · 850d4a6 · 850d4a6
2 parents 38bbaf4 + f56c260
commit 850d4a6
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 26 deletions.
diff --git a/library/ws-widget/collection/src/lib/_common/avatar-photo/avatar-photo.component.scss b/library/ws-widget/collection/src/lib/_common/avatar-photo/avatar-photo.component.scss
@@ -27,16 +27,16 @@
 
 .circle-m {
   border-radius: 10%;
-  width: 55px !important;
-  height: 55px !important;
+  width: 40px !important;
+  height: 40px !important;
   display: flex;
   justify-content: center;
   align-items: center;
 
   img {
     border-radius: 10%;
-    width: 55px;
-    height: 55px;
+    width: 40px;
+    height: 40px;
   }
 
   .initials {

diff --git a/library/ws-widget/collection/src/lib/card-content/card-content.component.scss b/library/ws-widget/collection/src/lib/card-content/card-content.component.scss
@@ -396,14 +396,24 @@
 
   .title-text {
     // font-size: 18px;
-    margin: $size-s 0;
-    position: relative;
-    overflow: hidden;
+    // margin: $size-s 0;
+    // position: relative;
+    // overflow: hidden;
     // height: $title-line-count * $title-line-height;
     // line-height: $title-line-height;
 
     word-break: break-word;
     white-space: initial;
+    margin: 12px 0;
+    position: relative;
+    overflow: hidden;
+    word-break: break-word;
+    white-space: initial;
+    white-space: initial;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
   }
 
   $description-line-count: 2;

diff --git a/...src/lib/routes/competencies/components/competencies-view/competencies-view.component.scss b/...src/lib/routes/competencies/components/competencies-view/competencies-view.component.scss
@@ -10,7 +10,7 @@
   box-shadow: none !important;
   height: fit-content;
   width:750px;
-  padding: 32px 8px!important;
+  padding: 24px 8px!important;
 
   h3.card_description {
     font-weight: 400!important;
@@ -84,8 +84,8 @@ p.competency_level_text {
 .learn-card-div {
   overflow-y: scroll;
   min-height: 215px;
-  max-height: 400px;
-  margin-bottom: 30px;
+  max-height: 300px;
+  margin-bottom: 24px;
 
   @include breakpoint-xs {
     max-height: 270px;
@@ -223,7 +223,7 @@ p.competency_level_text {
 .card_actions {
   margin-left: -32px;
   margin-right: -32px;
-  padding: 24px 24px 0px 0px;
+  padding: 16px 24px 0px 0px;
   border-top: 1px solid rgba(0, 0, 0, 0.08);
 
   @include breakpoint-xs {
@@ -250,3 +250,7 @@ p.competency_level_text {
     width:90%;
   }
 }
+
+.mat-card-actions {
+  margin-bottom:0!important
+}
diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html
@@ -1,25 +1,51 @@
-<div class="main_container flex flex-row">
+<div class="main_container flex flex-row" style=" background: url(assets/instances/eagle/banners/home/9/Login_background.png) no-repeat center center fixed;">
   <div class="left_container flex flex-col items-center justify-center">
     <div class="logo_box flex items-center">
-      <img src="/assets/instances/eagle/app_logos/KarmayogiBharat_Logo_Horizontal.svg" alt="logo">
-    </div>
-    <div class="slider_box items-center flex">
-      <img class="width-1-1" src="/assets/instances/eagle/banners/home/1/s.jpg" alt="slider1">
+      <img src="/assets/instances/eagle/app_logos/dopt_logo.png" alt="logo" class="logo_img">
     </div>
+
+    <div class="slideshow-container">
+
+       <div class="mySlides">
+        <img src="/assets/instances/eagle/app_logos/Hexagon.png" alt="karmayogi">
+        <!-- <img src="/assets/instances/eagle/app_logos/card3.png" alt="slide 1"> -->
+
+      </div>
+
+      <!-- <div class="mySlides">
+
+        <img src="/assets/instances/eagle/app_logos/Hexagon.png" alt="slide 2">
+
+      </div> -->
+
+
+
+
+
+
+
+      </div>
+      <br>
+
+      <!-- <div style="text-align:center">
+        <span class="dot"></span>
+        <span class="dot"></span>
+
+      </div> -->
   </div>
   <div class=" right_container flex flex-col items-center justify-center">
     <div class="right_inner_container">
-      <div class="right_logo_box">
-        <img src="/assets/instances/eagle/app_logos/KarmayogiBharat_Logo_Horizontal.svg" alt="logo">
+      <div class="right_logo_box right_logo_box flex items-center justify-center">
+        <img src="/assets/instances/eagle/app_logos/iGOT_Karmayogi_logo_with_karmayogi_bharat.png" alt="logo">
       </div>
       <div class="text_box flex items-center justify-center">
-        <h1 class="text-3xl"> You are logged out!</h1>
+        <h2 class="mat-h2"> Welcome to iGOT Karmayogi!</h2>
       </div>
       <div class="button_box flex flex-col items-center justify-center">
-        <button class="button m_b_2" (click)="login()">Login to portal</button>
+        <button class="button m_b_2" (click)="login()">Click here to login </button>
         <!-- <button class="button m_b_2">Login to MDO portal</button> -->
       </div>
     </div>
 
   </div>
-</div>
+</div>
diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss
@@ -1,8 +1,12 @@
-  body {
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.main_container {
       font-family: 'Poppins', sans-serif;
       position: relative;
       letter-spacing: 0.2px;
-      // background: url(images/Login_background.png) no-repeat center center fixed;
+
       background-size: cover;
     }
 
@@ -12,17 +16,28 @@
       height: 100vh;
       box-sizing: border-box;
       box-shadow: 0px 20px 60px #3e3e3e29;
+
+      @include breakpoint-xs {
+        width: 100%!important;
+      }
     }
 
     .left_container {
-      padding: 4.5rem 6rem;
+      padding: 5rem 6rem;
       box-sizing: border-box;
       width: 55%;
       height: 100vh;
+
+      @include breakpoint-xs {
+        display: none!important;
+      }
     }
 
     .logo_box {
       width: 320px;
+      img.logo_img {
+        width: 100%;
+      }
     }
 
     .slider_box {
@@ -33,17 +48,23 @@
     }
 
     .text_box {
-      margin: 3rem 0;
+      margin: 3rem 0 1rem;
     }
 
     .right_inner_container {
       width: 320px;
+
+      @include breakpoint-xs {
+        width: 300px!important;
+      }
     }
 
     .m_b_2 {
       margin-bottom: 1rem;
     }
 
+
+
     .button {
       font-family: 'Poppins', sans-serif;
       color: #F9F9F9;
@@ -54,4 +75,46 @@
       border-radius: 8px;
       transition: all .25s ease-in;
       width: 100%;
-    }
+      border:0;
+      cursor: pointer;
+    }
+
+    // .main_container {
+    //   background-image : url(assets/instances/eagle/banners/home/9/Login_background.png) no-repeat center center fixed;
+    // }
+
+  ::ng-deep .top-nav-bar {
+    display: none;
+  }
+
+  ::ng-deep .height-on-top {
+    padding-top: 0!important;
+  }
+
+
+
+
+.slideshow-container {
+  padding: 5rem 0 2rem 0;
+
+  @include breakpoint-s {
+     padding: 3rem 0 2rem 0!important;
+  }
+}
+
+  .mySlides {
+    height: auto;
+
+    img {
+      height: 430px;
+      width: auto;
+
+      @include breakpoint-s {
+        height: 325px!important;
+      }
+    }
+  }
+
+
+
+