From d00d4d4a54d9f541514d35cfa03904ebabd91741 Mon Sep 17 00:00:00 2001 From: khk Date: Mon, 20 Jan 2020 18:54:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 13 +++++++--- .../components/messages.component.scss | 26 +++++++++++-------- .../components/right-drawer.component.scss | 22 ++++++++-------- .../right-drawer/album-box.component.scss | 16 +++++++++--- .../right-drawer/file-box.component.scss | 17 +++++++----- .../right-drawer/notice.component.scss | 16 +++++++++--- .../room-user-list.component.html | 20 +++++++------- .../room-user-list.component.scss | 12 +++++++-- .../components/login.page.component.scss | 8 +++--- .../components/main.page.component.html | 2 +- .../components/main.page.component.scss | 16 +++++++++--- .../src/lib/components/login.component.scss | 18 ++++++++----- .../src/lib/components/form.component.html | 11 +++++++- .../src/lib/components/form.component.scss | 10 +++++++ .../lib/components/message-box.component.scss | 1 + .../message-box/information.component.scss | 1 + .../message-box/text.component.scss | 2 +- .../message-box/translation.component.scss | 2 +- .../lib/components/list-item.component.scss | 3 +++ .../lib/components/list-item.component.scss | 1 - .../src/assets/scss/partials/_list-item.scss | 7 ++--- .../assets/scss/partials/_search-frame.scss | 21 +++++++-------- .../file-upload-queue.component.scss | 6 ++--- .../translation-section.component.scss | 1 + 24 files changed, 164 insertions(+), 88 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index 6393c0f3..db114a8c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -13,8 +13,8 @@
+
+ {{ + getConvertTimer(roomInfoSubject.value.timeRoomInterval) + }} +

-
@@ -98,7 +103,7 @@ getConvertTimer(roomInfoSubject.value.timeRoomInterval) }} {{ 'chat.isRoomTypeSecret' | translate }} -
+
-->
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 f60fc12e..e7cda71a 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 @@ -40,11 +40,11 @@ display: flex; justify-content: space-between; justify-items: center; - padding: 10px 20px; + padding: 4px 20px; .profile-img { margin-right: 10px; - width: 40px; - height: 40px; + width: 30px; + height: 30px; .responsive-chats-button { display: none; line-height: normal; @@ -52,11 +52,11 @@ &:last-child { display: block; padding: 0; - width: 40px; - height: 40px; + width: 30px; + height: 30px; border-radius: 50%; color: #efefef; - font-size: 16px; + font-size: 1rem; } } &.thumbnail-mask { @@ -70,21 +70,21 @@ } .room-info { display: flex; - flex-flow: column; + flex-flow: row; overflow: hidden; + align-items: center; .room-name { - font-size: 1rem; + font-size: 0.94rem; line-height: normal; @include ellipsis(1); } .room-type { font-size: 0.9rem; line-height: normal; - margin-top: 2px; height: 20px; span { border-radius: 10px; - padding: 1px 10px; + padding: 2px 6px; margin-right: 6px; font-size: 0.7rem; } @@ -179,10 +179,14 @@ .profile-img { .chat-timer { .mat-button-wrapper { + display: flex; + justify-content: center; + justify-items: center; .mat-icon { line-height: normal; color: #ffffff; - transform: translateY(-1px); + font-size: 20px; + transform: translateY(1px); } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss index f2f5be6d..b9f3ad20 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss @@ -1,19 +1,19 @@ -.rightDrawer-title{ - height: 60px; +.rightDrawer-title { + height: 50px; border-bottom: 1px solid #dddddd; - font-size: 16px; + font-size: 1em; align-items: center; display: flex; padding: 0 20px; font-weight: 600; - span{ - margin-left:auto; + span { + margin-left: auto; } } ::ng-deep .mat-tab-labels { - display: flex; - width: 100%; - border-bottom: 2px solid #dddddd; - flex: 1 1 auto; - justify-content: space-around; -} \ No newline at end of file + display: flex; + width: 100%; + border-bottom: 2px solid #dddddd; + flex: 1 1 auto; + justify-content: space-around; +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss index 1aa9d37a..9726bb1a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss @@ -68,16 +68,14 @@ .img-item { cursor: pointer; margin-bottom: 10px; - margin-right: 9px; position: relative; - height: 150px; dl { dt { display: flex; justify-content: center; align-items: center; - width: 120px; - height: 120px; + width: 100px; + height: 100px; background-color: #efefef; border: 1px dotted #cccccc; box-sizing: border-box; @@ -104,6 +102,15 @@ display: flex; flex-flow: wrap; height: auto; + justify-content: space-between; + width: 100%; + .img-item { + cursor: pointer; + margin-bottom: 10px; + position: relative; + height: 130px; + width: 33%; + } } } } @@ -120,6 +127,7 @@ width: 100%; button { margin: 5px; + font-size: 0.9em; } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss index 9877e032..85043675 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss @@ -1,3 +1,5 @@ +$listH-row2: 60px; + @mixin ellipsis($row) { overflow: hidden; text-overflow: ellipsis; @@ -94,20 +96,19 @@ width: 100%; position: relative; th.infos { - padding: 16px; + padding: 10px; } tr.mat-row { - height: 70px; + height: $listH-row2; .cdk-column-check { width: 40px; } .file-info { - padding: 16px; + padding: 10px; display: grid; - height: 70px; + height: $listH-row2; .file-name { font-weight: 500; - margin-bottom: 2px; width: 100%; @include ellipsis(1); } @@ -138,9 +139,12 @@ height: calc(100% - 440px); overflow-y: auto; th { - font-size: 1.1em; + font-size: 1em; color: #333333; } + td { + font-size: 1em; + } } .mat-paginator-container { @@ -168,6 +172,7 @@ background-color: #ffffff; button { margin: 5px; + font-size: 0.9em; } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss index 4eb7cd31..8ebb0ff4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss @@ -10,6 +10,7 @@ -webkit-line-clamp: $row; -webkit-box-orient: vertical; word-wrap: break-word; + line-height: 1.2em; } } @@ -28,6 +29,7 @@ position: relative; th.infos { padding: 10px; + text-align: center; } tr.mat-row { height: 70px; @@ -38,14 +40,22 @@ .title { font-weight: 600; margin-bottom: 2px; - width: 50%; - @include ellipsis(1); - + width: 100%; + @include ellipsis(2); + display: flex; + align-items: center; .important { color: red; + margin-right: 6px; } } } + .date { + .date { + font-size: 0.8em; + text-align: right; + } + } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.html index 3ff00bd2..ccc83de1 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.html @@ -1,14 +1,16 @@
- - + + + +

Auto-resizing sidenav

--> -
+
diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss index 0f109d7c..b69b08d7 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss @@ -12,17 +12,17 @@ position: relative; } } - .contents { flex: 1 1 auto; - min-width: 400px; + min-width: 320px; height: 100%; - .messages { + .chat-messages { width: 100%; height: 100%; + font-size: 1em; } .rightDrawer { - width: 400px; + width: 320px; height: 100%; flex: 0 0 auto; overflow: hidden; @@ -40,3 +40,11 @@ ::ng-deep .mat-drawer-inner-container { overflow: unset !important; } + +::ng-deep .mat-tab-labels { + display: flex; + width: 100%; + border-bottom: 2px solid #dddddd; + flex: 1 1 auto; + justify-content: space-around; +} 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 253cc14d..dc447d4a 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 @@ -5,11 +5,15 @@ min-width: 100%; top: 0; right: 0; - padding: 16%; + padding: 14%; text-align: center; background-color: rgba(255, 255, 255, 1); border-radius: 0px; - @media all and (max-height: 900px), (max-width: 1400px) { + @media all and (max-height: 800px), (max-width: 1400px) { + width: 380px; + min-width: 380px; + } + @media all and (max-height: 1000px), (max-width: 1600px) { width: 420px; min-width: 420px; } @@ -17,16 +21,16 @@ .mat-title { margin: 10px 0 40px 0; text-indent: -10000000px; - width: 160px; - height: 160px; + width: 140px; + height: 140px; // background-image: url(/assets/images/logo/bg_login_w160.png); background-repeat: no-repeat; display: inline-flex; background-size: 100% auto; flex: 1 1 auto; - @media all and (max-height: 900px), (max-width: 1400px) { - width: 140px; - min-width: 140px; + @media all and (max-height: 800px), (max-width: 1400px) { + width: 120px; + min-width: 120px; margin: 10px 0 10px 0; } } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html index ea9500a1..a5f1fd87 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html @@ -36,7 +36,16 @@ (click)="onClickTranslation()" matTooltip="{{ 'chat.btnTranslate' | translate }}" > - g_translate + + + +
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss index a9be7d4f..dcde2020 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss @@ -10,6 +10,9 @@ .add-option { display: inline-flex; margin-right: 20px; + justify-items: center; + width: 80px; + justify-content: space-between; i { font-size: 20px; color: #666; @@ -23,6 +26,13 @@ border-radius: 50%; } } + button { + width: 20px; + height: 20px; + svg { + fill: #666666; + } + } } } textarea[name='message'] { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss index e6adc962..26d1a8bf 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss @@ -156,6 +156,7 @@ $meBox-bg: #ffffff; button { height: 100%; width: 100%; + font-size: 1em; line-height: 2em; border-radius: 100px; .mat-button-wrapper { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.scss index 66404243..825201f0 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.scss @@ -10,4 +10,5 @@ justify-content: center; justify-items: center; margin: 10px 0 20px; + font-size: 0.84em; } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss index 5fc47429..ed7da727 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss @@ -1,5 +1,5 @@ .bubble-main { - padding: 14px; + padding: 10px; text-align: left; span { word-wrap: break-word; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss index 1d0a18dd..cac4f26d 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss @@ -3,7 +3,7 @@ text-align: left; .original { - padding: 14px; + padding: 10px; } .translation { padding: 10px; diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss index df254f8e..b46e7252 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss @@ -26,6 +26,9 @@ width: 100%; position: relative; justify-items: center; + .mat-icon{ + font-size:18px; + } .final-message { white-space: nowrap; word-wrap: normal; diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss index 050af097..0e45ab2c 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss @@ -119,7 +119,6 @@ $thumbnail-msize: 40px; .date { float: right; width: 70px; - font-size: 11px; text-align: right; margin-left: 10px; color: $font-mid; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_list-item.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_list-item.scss index 204c4065..22365b4d 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_list-item.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_list-item.scss @@ -1,4 +1,6 @@ @charset 'utf-8'; +$listH-row2: 60px; +$line-basic: 1px solid #dddddd; @mixin ellipsis($row) { overflow: hidden; @@ -14,8 +16,6 @@ } } -$listH-row2: 60px; -$line-basic: 1px solid #dddddd; %list-item { position: relative; display: flex; @@ -117,10 +117,11 @@ $line-basic: 1px solid #dddddd; .final-message, .dept { font-size: 0.86em; + color: #777777; @include ellipsis(1); } .date { - font-size: 0.7em; + font-size: 0.8em; @include ellipsis(1); } } diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss index f7bc43d4..0b0a7642 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss @@ -35,18 +35,6 @@ $search-font-size: 14px; } } -/*.list-search-frame { - .selectbox { - display: inline-flex; - width: 40%; - padding: 0 20px; - } - & + .searchbox { - width: 60%; - padding-right: 20px; - } -} -*/ .list-search-frame { .searchbox { height: 100%; @@ -83,6 +71,15 @@ $search-font-size: 14px; bottom: 0; background-color: unset !important; } + + /* &.mat-form-field-can-float { + &.mat-form-field-should-float .mat-form-field-label, + .mat-input-server:focus + + .mat-form-field-label-wrapper + .mat-form-field-label { + color: red; + } + }*/ } } } diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-upload-queue.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/file-upload-queue.component.scss index 59f0c5b8..d5a9ad54 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/file-upload-queue.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/file-upload-queue.component.scss @@ -20,10 +20,10 @@ min-width: 200px; margin: 0 1%; margin-bottom: 10px; - width: 48%; + width: 100%; border-radius: 3px; - background-color:#f9f9f9; - border:1px solid #dddddd; + background-color: #f9f9f9; + border: 1px solid #dddddd; .file-upload-info { padding: 10px; svg { diff --git a/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss index e6e8a7cb..d6a43cb9 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss @@ -52,6 +52,7 @@ padding: 0 40px; justify-items: flex-end; align-content: space-between; + font-size: 0.9em; /*background-color: rgba(30, 167, 185, 0.1); border-top: 1px solid rgba(30, 167, 185, 0.3); border-bottom: 1px solid rgba(30, 167, 185, 0.3);*/