From 953760be66cc51a94ecf0f234947e710ecc79c13 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Tue, 24 May 2022 17:48:39 +0530 Subject: [PATCH 1/5] logout ui fix --- .../public-logout.component.html | 44 +++++++++++++++---- .../public-logout.component.scss | 39 ++++++++++++++-- 2 files changed, 71 insertions(+), 12 deletions(-) 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..2c11d50b9 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!

- +
-
\ 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..c72f6117e 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,8 @@ - body { +.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; } @@ -44,6 +44,8 @@ margin-bottom: 1rem; } + + .button { font-family: 'Poppins', sans-serif; color: #F9F9F9; @@ -54,4 +56,35 @@ 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; + } + + + + + + + .mySlides { + height: auto; + width: 320px; + // position: absolute; + // transition: opacity .5s ease-in; + + // img { opacity: 0; } + } + + + From 5ee18c4a879a6c4e9bee77fc076015c722d2e000 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Tue, 24 May 2022 18:58:01 +0530 Subject: [PATCH 2/5] update logout code --- .../public-logout/public-logout.component.html | 2 +- .../public-logout/public-logout.component.scss | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) 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 2c11d50b9..cf3ce7f45 100644 --- a/src/app/routes/public/public-logout/public-logout.component.html +++ b/src/app/routes/public/public-logout/public-logout.component.html @@ -1,7 +1,7 @@
- logo + logo
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 c72f6117e..966bc42a0 100644 --- a/src/app/routes/public/public-logout/public-logout.component.scss +++ b/src/app/routes/public/public-logout/public-logout.component.scss @@ -15,7 +15,7 @@ } .left_container { - padding: 4.5rem 6rem; + padding: 5rem 6rem; box-sizing: border-box; width: 55%; height: 100vh; @@ -23,6 +23,10 @@ .logo_box { width: 320px; + + img.logo_img { + width: 100%; + } } .slider_box { @@ -75,15 +79,22 @@ - +.slideshow-container { + padding: 5rem 0 2rem 0; +} .mySlides { height: auto; - width: 320px; + // width: 320px; // position: absolute; // transition: opacity .5s ease-in; // img { opacity: 0; } + + img { + height: 430px; + width: auto; + } } From a7b3f4e83e70c857e1573cc51383db9169cef49b Mon Sep 17 00:00:00 2001 From: nitin raj Date: Tue, 24 May 2022 19:33:18 +0530 Subject: [PATCH 3/5] test bug fix and responsive implemented --- .../avatar-photo/avatar-photo.component.scss | 8 ++--- .../public-logout.component.html | 6 ++-- .../public-logout.component.scss | 33 +++++++++++++++---- 3 files changed, 33 insertions(+), 14 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 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/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html index cf3ce7f45..d2d609939 100644 --- a/src/app/routes/public/public-logout/public-logout.component.html +++ b/src/app/routes/public/public-logout/public-logout.component.html @@ -27,11 +27,11 @@

-
+
@@ -39,7 +39,7 @@ logo
-

You are logged out!

+

You are logged out!

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 966bc42a0..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,3 +1,7 @@ +@import 'ws-common'; +@import 'ws-vars'; +@import 'ws-mixins'; + .main_container { font-family: 'Poppins', sans-serif; position: relative; @@ -12,6 +16,10 @@ height: 100vh; box-sizing: border-box; box-shadow: 0px 20px 60px #3e3e3e29; + + @include breakpoint-xs { + width: 100%!important; + } } .left_container { @@ -19,11 +27,14 @@ box-sizing: border-box; width: 55%; height: 100vh; + + @include breakpoint-xs { + display: none!important; + } } .logo_box { width: 320px; - img.logo_img { width: 100%; } @@ -37,11 +48,15 @@ } .text_box { - margin: 3rem 0; + margin: 3rem 0 1rem; } .right_inner_container { width: 320px; + + @include breakpoint-xs { + width: 300px!important; + } } .m_b_2 { @@ -81,21 +96,25 @@ .slideshow-container { padding: 5rem 0 2rem 0; + + @include breakpoint-s { + padding: 3rem 0 2rem 0!important; + } } .mySlides { height: auto; - // width: 320px; - // position: absolute; - // transition: opacity .5s ease-in; - - // img { opacity: 0; } img { height: 430px; width: auto; + + @include breakpoint-s { + height: 325px!important; + } } } + From 13ede7c22cf1853fbebf172e213849d6195a1e8c Mon Sep 17 00:00:00 2001 From: nitin raj Date: Wed, 25 May 2022 11:30:25 +0530 Subject: [PATCH 4/5] bug fixed for logout and competency popup --- .../competencies-view.component.scss | 12 ++++++++---- .../public-logout/public-logout.component.html | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) 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 d2d609939..5c498222d 100644 --- a/src/app/routes/public/public-logout/public-logout.component.html +++ b/src/app/routes/public/public-logout/public-logout.component.html @@ -39,7 +39,7 @@ logo
-

You are logged out!

+

Welcome to iGOT Karmayogi!

From 7a0ab63703d7fbfd230589891098f8fe059f07e2 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Wed, 25 May 2022 11:41:01 +0530 Subject: [PATCH 5/5] card title test overlaping fixed --- .../card-content/card-content.component.scss | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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 5fa545555..22e2e5bf3 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,17 +396,27 @@ .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: 3; + $description-line-count: 2; $description-line-height: 21px; .description-text {