diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss index 84e841f0..d3b3afe7 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss @@ -10,12 +10,13 @@ } ::ng-deep .mat-tab-header { border-bottom: none !important; + width: 100%; } .left-side-tabs-body { position: relative; height: 100%; - width: calc(100% - 70px); + width: calc(100% - 60px); div[id^='tabs'] { height: 100%; width: 100%; @@ -30,7 +31,7 @@ .mat-tab-group { display: flex; - width: 70px; + width: 60px; flex-direction: row; } @@ -64,7 +65,7 @@ .mat-tab-label { width: 100%; height: 80px; - padding: 0 16px; + padding: 0; } } .mat-ink-bar { @@ -102,6 +103,9 @@ stroke-linejoin: miter; fill: none; } + .mat-badge-content { + right: -4px !important; + } } } &[aria-selected='true'] { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss index d35ed6f6..072b92a2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss @@ -17,7 +17,6 @@ position: relative; display: flex; flex-direction: row; - height: 60px; align-items: center; padding: 0; font-size: 14px; @@ -70,7 +69,7 @@ } .app-layout-chat-left-sidenav-chat-list { - height: calc(100% - 130px); + height: calc(100% - 120px); position: relative; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss index e05fde28..6a204472 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss @@ -20,7 +20,6 @@ .list-search { display: flex; flex-direction: row; - height: 60px; align-items: center; padding: 0; font-size: 14px; @@ -75,7 +74,7 @@ ::ng-deep .message-box { .message-section { position: relative; - height: calc(100% - 130px); + height: calc(100% - 120px); .message-tab { position: relative; height: 100%; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss index cd51fd7a..967c232c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss @@ -42,7 +42,7 @@ } } .search-result { - height: calc(100% - 40px); + height: calc(100% - 30px); overflow: auto; .result-num { padding: 10px; @@ -52,7 +52,7 @@ } .oraganization-tab { - height: calc(100% - 130px); + height: calc(100% - 120px); flex-direction: inherit; display: flex; .oraganization-tab-tree { 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 77aa04a3..f60fc12e 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 @@ -43,6 +43,8 @@ padding: 10px 20px; .profile-img { margin-right: 10px; + width: 40px; + height: 40px; .responsive-chats-button { display: none; line-height: normal; @@ -57,8 +59,6 @@ font-size: 16px; } } - width: 50px; - height: 50px; &.thumbnail-mask { border-radius: 50%; overflow: hidden; @@ -73,20 +73,20 @@ flex-flow: column; overflow: hidden; .room-name { - font-size: 16px; + font-size: 1rem; line-height: normal; @include ellipsis(1); } .room-type { - font-size: 14px; + font-size: 0.9rem; line-height: normal; - margin-top: 6px; + margin-top: 2px; height: 20px; span { border-radius: 10px; padding: 1px 10px; margin-right: 6px; - font-size: 13px; + font-size: 0.7rem; } } } @@ -182,7 +182,7 @@ .mat-icon { line-height: normal; color: #ffffff; - transform: translateY(-3px); + transform: translateY(-1px); } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss index cf7a4e16..e185152d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss @@ -73,18 +73,21 @@ } } -::ng-deep .mat-dialog-container .mat-tab-body-wrapper { - height: 380px; - width: 100%; - .mat-tab-body { +::ng-deep .mat-dialog-container { + .mat-tab-body-wrapper { + height: 380px; width: 100%; - height: 100%; - .mat-tab-body-content { + .mat-tab-body { width: 100%; height: 100%; + .mat-tab-body-content { + width: 100%; + height: 100%; + } } } } + .mat-tab-frame { width: 100%; height: 100%; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index 328971b9..60a4e45c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -9,7 +9,7 @@ display: flex; padding: 0 10px; cursor: pointer; - height: 50px; + height: 60px; color: #ffffff; //background: rgba(37, 27, 30, 0.9); //border-bottom: 1px solid #d5dadb; 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 eec9a211..9c47bec8 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 @@ -2,7 +2,7 @@ height: 100%; display: flex; flex-flow: row; - padding-top: 47px; + padding-top: 57px; border-top: none; .split-area { overflow: hidden; 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 a69f192a..f253b662 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -337,7 +337,7 @@ $daesang-grey: ( display: flex; justify-content: center; padding: 0 10px; - height: 70px; + height: 60px; background-color: #eeeeee; background: $gradient-light; background: -webkit-linear-gradient( @@ -349,6 +349,10 @@ $daesang-grey: ( color: #ffffff; } + .list-search{ + height:60px; + } + mat-tab-group[vertical] { display: flex; flex-direction: row; diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html index 2a2226a9..3146a78b 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html @@ -1,6 +1,6 @@ @@ -16,7 +16,6 @@ @@ -37,7 +36,6 @@ diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.scss b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.scss index 2a23bb20..63e297ae 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.scss +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.scss @@ -13,7 +13,7 @@ .tree-node-frame { border-bottom: 1px solid #dddddd; - height: 40px; + height: 64px; .tree-node-header { position: relative; @@ -49,6 +49,7 @@ .mat-tree-node { width: 100%; + height: 100%; &:hover { background-color: #f4f4f4; border: 1px solid #cccccc; diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html index 3a80a0c1..e5c30f93 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html @@ -64,7 +64,7 @@ {{ message.regDate | ucapDate: 'C' }} N 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 baeb82b3..c0f4215d 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 @@ -7,22 +7,22 @@ width: calc(100% - 80px); dt { .name { - font-size: 16px; + font-size: 1.1em; overflow: hidden; text-overflow: ellipsis; display: block; white-space: nowrap; word-wrap: normal; font-weight: 600; + margin-bottom: 2px; span { - font-size: 13px; + font-size: 0.9em; } } } dd { color: #777777; - margin-top: 4px; white-space: nowrap; word-wrap: normal; text-overflow: ellipsis; @@ -30,22 +30,25 @@ width: 100%; position: relative; overflow: hidden; + font-size: 0.9em; } } .date { display: flex; flex-flow: column; - align-self: flex-start; - .badge-new { + font-size: 0.9em; + height: 40px; + .noti-new { border-radius: 50%; color: #ffffff; padding: 0; text-align: center; align-self: flex-end; + align-items: center; width: 20px; height: 20px; - font-size: 12px; - margin-top: 4px; + font-size: 0.9em; + margin-top: 3px; } } } diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html index c4770966..7f5fcd93 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html @@ -1,167 +1,185 @@
-
- - - {{ - 'message.countOfReceiver' | translate: { count: receiverList.length } - }} - -
- - - {{ receiver.name }} - - - - - - - - - - -
- -
- - - - {{ oldAttachment.resContent }} - - - - {{ attachment.name }} - - -
-
- - -
-
- {{ contentLength }}/1000 -
-
-
-
- - -
-
- -
+ + - {{ 'message.sendTo' | translate }} - - + {{ receiver.name }} + + + - + + + + + +
+ +
+ + + + {{ oldAttachment.resContent }} + + + +
+ {{ attachment.name }} + +
+
+
+
+
+ + + +
+
+ + +
+
+ {{ contentLength }}/1000 +
+
+ + +
+
+ + + + + -
-
- + +
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss index 65ba68b9..4eb4ea0c 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss @@ -1,22 +1,16 @@ .ucap-message-write { width: 100%; height: 100%; - - .message-receiver-list { - width: 100%; - height: 100px; + form { + height: 400px; + perfect-scrollbar { + .ps--active-x > .ps__rail-x { + display: none; + } + } } .message-write-body { - - - [contenteditable] { - } - - [contenteditable]:hover, - [contenteditable]:focus { - } - [contenteditable]:hover { background: #fafafa; } @@ -37,6 +31,18 @@ flex: 1 1 auto; } } + .message-option { + display: flex; + flex-flow: row; + flex: 1 1 auto; + height: 40px; + .editor-tools { + } + .length { + margin-left: auto; + align-self: center; + } + } } .message-content { @@ -60,23 +66,13 @@ width: 100%; height: 100%; padding: 10px; - height: 280px; - overflow: auto; - } - .message-option { - display: flex; - flex-flow: row; - flex: 1 1 auto; - height: 40px; - .editor-tools { - } - .length { - margin-left: auto; - align-self: center; - } + min-height: 250px; + border: 1px solid #dddddd; + //overflow: auto; } } } + .mat-card-actions { margin: 0 0 20px; border-top: 1px solid #dddddd; @@ -119,8 +115,9 @@ } .mat-chip-list { .mat-chip-list-wrapper { - max-height: 100px; - overflow: auto; + margin: 0; + /* max-height: 100px; + overflow: auto;*/ } } .message-title { @@ -128,3 +125,25 @@ margin-top: 10px; } } +::ng-deep .attach-file { + display: flex; + flex-flow: row; + flex: 1 1 auto; + .mat-list-item-content { + padding: 0 !important; + .file-name { + display: flex; + width: 100%; + align-items: center; + font-size: 0.9em; + border-bottom: 1px dotted #dddddd; + span { + margin-right: 6px; + } + button { + width: 24px; + margin-left: auto; + } + } + } +} diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss index 79df6ce6..99e03a39 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss @@ -39,6 +39,7 @@ height: 10px; border: 1px solid #ffffff; align-self: flex-end; + transform: translateY(0px); } button { cursor: pointer; diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html index a4725c1f..1a7af7cb 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html @@ -23,7 +23,7 @@
-
+ diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss index 548d23e5..18cc4776 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss @@ -7,7 +7,7 @@ $font-white: #ffffff; $line-basic: 1px solid #dddddd; $bg-list-item-msg: #f0f4f6; $bg-list-hover: #efefef; -$listH-row2: 80px; +$listH-row2: 60px; $presence-size: 8px; $thumbnail-msize: 40px; @@ -26,23 +26,6 @@ $thumbnail-msize: 40px; } } -.badge-mobile-state { - position: absolute; - background-color: #ffffff; - width: 18px; - height: 18px; - border-radius: 50%; - bottom: 14px; - left: 60px; - text-align: center; - .mat-icon { - font-size: 14px; - width: 18px; - height: 18px; - line-height: 18px; - } -} - %list-item { position: relative; display: flex; @@ -65,7 +48,7 @@ $thumbnail-msize: 40px; border-radius: 4px; } -.list-item { +/*.list-item { @extend %list-item; &:hover { background-color: $bg-list-hover; @@ -73,13 +56,14 @@ $thumbnail-msize: 40px; .mat-checkbox { padding-left: 10px; } -} +}*/ .item-default { display: flex; width: 100%; dt { flex: none; + position: relative; .thumbnail { width: $thumbnail-msize; height: auto; @@ -92,34 +76,37 @@ $thumbnail-msize: 40px; margin: 0; padding: 0; width: calc(100% - 50px); + transform: translateY(2px); .detail { - div { + .user-info { display: flex; flex-flow: row; + margin-bottom: 2px; .work-status { margin-right: 4px; border-radius: 4px; padding: 0 6px; color: #ffffff; - font-size: 12px; + font-size: 0.9em; width: 40px; justify-items: center; height: 100%; } .name { - font-size: 13px; margin-bottom: 2px; color: $font-dark; width: calc(100% - 40px); @include ellipsis(1); b { - font-size: 16px; font-weight: 600; } + .grade { + font-size: 0.9em; + } } } .dept { - font-size: 12px; + font-size: 0.9em; color: $font-mid; @include ellipsis(1); } diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index f3ffec90..2f3b4462 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -60,8 +60,7 @@ class="num bg-accent-light" *ngIf="roomInfo.roomType === RoomType.Multi" > - {{ roomInfo.joinUserCount }} - {{ 'common.units.persons' | translate }} + {{ roomInfo.joinUserCount }}{{ 'common.units.persons' | translate }}
notifications_off 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 a35cfad6..e2c32a28 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 @@ -24,23 +24,6 @@ $thumbnail-msize: 40px; } } -.badge-timer { - position: absolute; - background-color: #ffffff; - width: 18px; - height: 18px; - border-radius: 50%; - bottom: 14px; - left: 46px; - text-align: center; - .mat-icon { - font-size: 14px; - width: 18px; - height: 18px; - line-height: 18px; - } -} - .profile { white-space: normal; text-align: left; @@ -84,15 +67,7 @@ $thumbnail-msize: 40px; line-height: 20px; } } -%list-item { - position: relative; - display: flex; - align-items: center; - width: 100%; - height: $listH-row2; - border-bottom: $line-basic; - padding: 20px; -} + .item-default { display: flex; width: 100%; @@ -113,10 +88,9 @@ $thumbnail-msize: 40px; display: inline-flex; color: $font-dark; width: 100%; - margin-bottom: 2px; align-items: center; .name { - font-size: 16px; + font-size: 1.1em; @include ellipsis(1); font-weight: 600; } @@ -126,17 +100,17 @@ $thumbnail-msize: 40px; fill: currentColor; height: 12px; width: 12px; - font-size: 16px; + font-size: 1.1em; color: #666666; margin-left: 4px; line-height: unset; } .num { - font-size: 12px; + font-size: 0.9em; flex: none; margin-left: 6px; border-radius: 3px; - padding: 1px 6px; + padding: 0 4px; color: #ffffff; } } @@ -167,7 +141,6 @@ $thumbnail-msize: 40px; } .list-item { - @extend %list-item; &:hover { background-color: $bg-list-hover; } 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 3e024f06..01e6a649 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 @@ -14,6 +14,19 @@ -webkit-box-orient: vertical; word-wrap: break-word; } + +$listH-row2: 64px; +$line-basic: 1px solid #dddddd; +%list-item { + position: relative; + display: flex; + align-items: center; + font-size: 14px; + width: 100%; + height: $listH-row2; + border-bottom: $line-basic; + padding: 0 20px; +} .mat-card-header .mat-card-title { margin: 0 -16px; padding-bottom: 10px; @@ -27,6 +40,7 @@ } .list-item { + @extend %list-item; .thumbnail { &-mask { width: 40px; @@ -34,6 +48,7 @@ border-radius: 50%; overflow: hidden; margin-right: 16px; + position: relative; img { width: 40px; height: auto; @@ -41,4 +56,25 @@ } } } + span[class*='badge'] { + position: absolute; + background-color: #ffffff; + width: 20px; + height: 20px; + border-radius: 50%; + bottom: 0px; + left: 30px; + display: flex; + align-items: center; + align-content: center; + justify-content: center; + .mat-icon { + font-size: 1em; + width: 18px; + height: 18px; + line-height: 18px; + min-width: 18px; + min-height: 18px; + } + } } diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss index 532c30df..19f05c82 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss @@ -7,6 +7,7 @@ text-indent: -10000000px; margin-right: 4px; border-radius: 50%; + transform: translateY(12px); } .presence { @extend %presence;