From f287a1a3cd344638be514a425d294b6df37019c3 Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 8 Jan 2020 15:40:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A1=9C=EB=94=A9=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/scss/global/_default.scss | 4 + .../src/assets/scss/partials/splash.css | 97 ++++++++++++++++++- projects/ucap-webmessenger-app/src/index.html | 11 ++- 3 files changed, 105 insertions(+), 7 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index d4b8294d..8a2f952b 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -282,6 +282,10 @@ $daesang-grey: ( } } + .load-container .loader:after{ + background: mat-color($accent); + } + .global-menu { .mat-tab-label[aria-selected='true'] { .mat-tab-label-content { diff --git a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css index da815e5c..f8c458ad 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css +++ b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css @@ -1,17 +1,19 @@ .wrapper-splash { position: absolute; + display: flex; + justify-content: center; + justify-items: center; z-index: 99999; width: 100%; height: 100%; pointer-events: none; background-size: cover; height: 100%; - background: #eaeff1; - background: linear-gradient(to top, #93a3af, #eaeff1); + /*background: linear-gradient(to top, #93a3af, #eaeff1);*/ margin: 0; padding: 0; } -.svg-img { +/*.svg-img { position: absolute; width: 240px; height: 120px; @@ -45,4 +47,93 @@ #loop-offset { display: none; +}*/ +.load-container { + display: flex; + flex-flow: column; + justify-content: center; + justify-items: center; + transform: translateY(-60px); +} + +.load-container .loader { + font-size: 10px; + margin: 50px auto; + text-indent: -9999em; + width: 11em; + height: 11em; + border-radius: 50%; + background: #ffffff; + background: -moz-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: -webkit-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: -o-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%); + background: -ms-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: linear-gradient(to right, #00b6d5 10%, #fb8c00, 42%); + position: relative; + -webkit-animation: load3 1.4s infinite linear; + animation: load3 1.4s infinite linear; + -webkit-transform: translateZ(0); + -ms-transform: translateZ(0); + transform: translateZ(0); +} +.load-container .loader:before { + width: 50%; + height: 50%; + background: #ffffff; + border-radius: 100% 0 0 0; + position: absolute; + top: 0; + left: 0; + content: ''; +} +.load-container .loader:after { + width: 75%; + height: 75%; + border-radius: 50%; + content: ''; + margin: auto; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; +} +.credit { + color: #f2f2f2; + margin: 0 auto; + font-size: 1.2em; + font-weight: 500; +} + +@-webkit-keyframes load3 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes load3 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } } diff --git a/projects/ucap-webmessenger-app/src/index.html b/projects/ucap-webmessenger-app/src/index.html index 05d03fa3..eeef4573 100644 --- a/projects/ucap-webmessenger-app/src/index.html +++ b/projects/ucap-webmessenger-app/src/index.html @@ -12,8 +12,8 @@ -
- + +
+
+ Welcome to DS Talk +
From 843303db956229c16ac0354226001c534019f982 Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 8 Jan 2020 15:58:16 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8A=A4=ED=94=8C=EB=A0=88=EC=8B=9C=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/layouts/messenger/components/messages.component.scss | 4 ++-- .../src/assets/scss/global/_default.scss | 4 ++-- .../ucap-webmessenger-app/src/assets/scss/partials/splash.css | 4 ++-- projects/ucap-webmessenger-app/src/index.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss index 1db7c72e..95fdbca9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss @@ -46,6 +46,7 @@ .responsive-chats-button { display: none; + line-height: normal; &:last-child { display: block; padding: 0; @@ -54,7 +55,6 @@ border-radius: 50%; color: #efefef; font-size: 16px; - line-height: 40px; } } width: 50px; @@ -84,7 +84,7 @@ height: 20px; span { border-radius: 10px; - padding: 2px 10px; + padding: 1px 10px; margin-right: 6px; font-size: 13px; } diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 8a2f952b..b6927d16 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -282,8 +282,8 @@ $daesang-grey: ( } } - .load-container .loader:after{ - background: mat-color($accent); + .load-container .loader:after { + background-color: mat-color($accent, 300); } .global-menu { diff --git a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css index f8c458ad..5788c47a 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css +++ b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css @@ -111,9 +111,9 @@ right: 0; } .credit { - color: #f2f2f2; + color: #ffffff; margin: 0 auto; - font-size: 1.2em; + font-size: 1.3em; font-weight: 500; } diff --git a/projects/ucap-webmessenger-app/src/index.html b/projects/ucap-webmessenger-app/src/index.html index eeef4573..c2841e4c 100644 --- a/projects/ucap-webmessenger-app/src/index.html +++ b/projects/ucap-webmessenger-app/src/index.html @@ -12,7 +12,7 @@ -
+
- 여기까지 읽었습니다. + {{ 'chat.event.readToHere' | translate }}
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/recall.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/recall.component.html index 5cf7c2be..606aa010 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/recall.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/recall.component.html @@ -1,4 +1,4 @@
redo - 회수된 메시지 + {{ 'chat.event.recalled' | translate }}
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html index be93d414..d6e09e9b 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html @@ -5,27 +5,31 @@ > - [이벤트] 등록 + {{ 'chat.event.scheduleTypeNew' | translate }} - [이벤트] 수정 + {{ 'chat.event.scheduleTypeUpdate' | translate }} - [이벤트] 삭제 + {{ 'chat.event.scheduleTypeDelete' | translate }} - [이벤트] 조회중.. + {{ 'chat.event.scheduleTypeDefault' | translate }}