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 index fa866e684..07ff74faf 100644 --- 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 index 430595105..504014376 100644 --- 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/project/ws/app/src/lib/routes/competencies/components/competencies-view/competencies-view.component.scss b/project/ws/app/src/lib/routes/competencies/components/competencies-view/competencies-view.component.scss index 46214d031..6f1226852 100755 --- a/project/ws/app/src/lib/routes/competencies/components/competencies-view/competencies-view.component.scss +++ b/project/ws/app/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 index a8e55f61b..5c498222d 100644 --- 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 @@ -
+
- logo -
-
- slider1 + logo
+ +
+ +
+ karmayogi + + +
+ + + + + + + + + +
+
+ +
-
- logo +
+ logo
-

You are logged out!

+

Welcome to iGOT Karmayogi!

- +
-
\ No newline at end of file +
diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss index 1de7f8db3..73ea6b56d 100644 --- 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%; - } \ No newline at end of file + 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; + } + } + } + + + +