diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html index d0371279..ceb4974d 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html @@ -1,6 +1,6 @@
-
+ .notice { diff --git a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html index 4f552c9f..4a12ac0b 100644 --- a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html +++ b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html @@ -21,20 +21,66 @@ - +
+ + + + + + + + +
- +
+ + + + login-lock + + + + + + + + + +
-
+
+
{{ !!notiText ? notiText : '개인정보 처리방침' }} diff --git a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss index b8bfda60..a055bfc0 100644 --- a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss +++ b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss @@ -31,7 +31,6 @@ $login-max-height: 800px; min-width: 100%; top: 0; right: 0; - padding: 14%; text-align: center; background-color: rgba(255, 255, 255, 1); border-radius: 0px; @@ -40,8 +39,8 @@ $login-max-height: 800px; .mat-title { margin: 10px 0 10px 0; text-indent: -10000000px; - width: 140px; - height: 140px; + width: 120px; + height: 120px; background-repeat: no-repeat; display: inline-flex; background-size: 100% auto; @@ -53,12 +52,33 @@ $login-max-height: 800px; width: 100%; text-align: left; - mat-form-field { - width: 100%; - &.login-pw { - margin-top: 10px; - @media screen and (max-width: #{$tablet-s-width}) { - margin-top: 0; + .input-lineless { + background-color: #e0e0e0; + padding: 14px 20px; + margin-top: 6px; + display: flex; + flex-flow: row; + @media screen and (max-width: #{$tablet-s-width}) { + padding: 8px 20px; + } + .icon-img { + width: 20px; + height: 20px; + margin-right: 10px; + svg { + width: 100%; + height: 100%; + } + } + + mat-form-field { + width: 100%; + color: #333333; + &.login-pw { + //margin-top: 10px; + @media screen and (max-width: #{$tablet-s-width}) { + margin-top: 0; + } } } } @@ -83,8 +103,14 @@ $login-max-height: 800px; .submit-button { width: 100%; margin: 0 auto; - margin: 1.4vh 0; + margin: 20px 0 10px; display: block; + border-radius: 0; + line-height: 50px; + font-size: 1.1em; + @media screen and (max-width: #{$tablet-s-width}) { + line-height: 38px; + } } } @@ -132,18 +158,32 @@ $login-max-height: 800px; } .policy { position: absolute; - bottom: 5vh; + bottom: 2vh; display: block; - text-align: center; - opacity: 0.7; - padding: 6px; - border-radius: 100px; - width: 72%; - color: #333333; + background-color: #58b0b1; + width: 100%; + color: #ffffff; font-size: 0.86em; + display: flex; + flex-flow: row; + align-items: center; &:hover { opacity: 1; } + .icon-img { + padding: 12px 10px; + width: 50px; + color: #ffffff; + padding-right: 10px; + border-right: 1px solid rgba(255, 255, 255, 0.7); + flex: 0 0 auto; + @media screen and (max-width: #{$tablet-s-width}) { + padding: 9px 10px; + } + } + a { + margin-left: 10px; + } } button { &.google, @@ -156,22 +196,11 @@ $login-max-height: 800px; } } -@include desktop-m { - .login-form { - .mat-title { - background-size: 86% auto; - } - } -} - @include tab { .login-form { font-size: 0.9em; - padding: 12%; .mat-title { - width: 14vh; - height: 14vh; - margin: 10px 0 10px 0; + background-size: 90% auto; } .mat-form-field .mat-form-field-infix input { font-size: 0.9em; @@ -179,13 +208,11 @@ $login-max-height: 800px; .policy { position: absolute; bottom: 0; - display: block; - text-align: center; - opacity: 0.7; + display: flex; + flex-flow: row; padding: 0; border-radius: 0; width: 100%; - margin-left: -12%; font-size: 0.9em; padding: 0px; line-height: 3em;