diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html index a8921446..7edc38e5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html @@ -27,7 +27,14 @@ [hasBackdrop]="false" > - group_add + + + + + + + 새 그룹 추가 diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss index 2111a8fc..1f8cafc1 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss @@ -37,3 +37,10 @@ height: 100%; overflow: unset; } +.mat-menu-item{ + display:flex; + align-items: center; + svg{ + margin-right:10px; + } +} \ No newline at end of file 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 0c6e4b26..9a1f51b2 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 @@ -56,7 +56,7 @@ *ngIf="roomInfo && roomInfo.isTimeRoom" class="room-type text-accent-color " > - {{ getConvertTimer(roomInfo.timeRoomInterval) }} 비밀 대화방입니다. 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 6e200e6d..5a051a2b 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 @@ -25,7 +25,7 @@ .chat-toolbar { width: 100%; height: 80px; - min-height: 70px; + min-height: 80px; align-items: center; background-color: #ffffff !important; border-bottom: 1px solid #dddddd; @@ -68,7 +68,7 @@ height: 20px; span { border-radius: 10px; - padding: 1px 10px; + padding: 2px 10px; margin-right: 6px; font-size: 13px; } 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 2c156946..2452c863 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 @@ -76,3 +76,6 @@ } } } +.mat-tab-group>.mat-tab-header .mat-tab-label{ + border-bottom:2px solid #dddddd; +} \ No newline at end of file diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss index f4b0a68f..e10c94de 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss @@ -20,6 +20,8 @@ flex-direction: column; text-align: left; line-height: 1.6em; + width:100%; + margin-top:10px; .file-name { font-size: 14px; font-weight: bold; @@ -59,5 +61,14 @@ display: block; } } + &.expired{ + li{ + width:100%; + white-space: nowrap; + color:#999999; + align-items: center; + line-height:40px; + } + } } -} +} \ No newline at end of file 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 8397c09d..7a7c496d 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 @@ -51,16 +51,17 @@ } } } + .box-more-spacer { margin-right: 0; } ::ng-deep .mat-content{ - overflow: unset; + overflow: unset !important; } .number{ - margin-left:6px; - display: inline-flex; - flex: 0 0 auto; - } \ No newline at end of file + margin-left:6px; + display: inline-flex; + flex: 0 0 auto; +} \ No newline at end of file diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/document-viewer.component.html b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/document-viewer.component.html index 25607b58..0f1561d1 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/document-viewer.component.html +++ b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/document-viewer.component.html @@ -1,5 +1,5 @@ - + Third Line - video_label + + + + + + + + + + + {{ fileInfo.fileName }} - get_app + + + + - + - Close + + + + @@ -41,43 +61,52 @@ (loadeddata)="onLoadedDataVideo()" > - - + - - - - - {{ currentTime | ucapSecondsToMinutes }} + + - - - {{ playing ? 'pause' : 'play_arrow' }} - - - - {{ duration | ucapSecondsToMinutes }} + + {{ currentTime | ucapSecondsToMinutes }} + + + + {{ playing ? 'pause' : 'play_arrow' }} + + + + + {{ duration | ucapSecondsToMinutes }} + diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.scss index 7ad92977..0e1f1c55 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.scss @@ -4,40 +4,57 @@ .ucap-video-viewer-header { width: 100%; - height: 50px; + height: 60px; + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.6); + background-color: #333333; .ucap-video-viewer-icon { + margin-right: 10px; } .ucap-video-viewer-title { + font-size:16px; + } + .stroke-bar { + width: 1px; + height: 30px; + background-color: rgba(256, 256, 256, 0.3); + margin: 0 10px; + } + .ucap-image-viewer-action { + &:hover { + opacity: 0.7; + } } } .ucap-video-viewer-body { position: relative; - background-color: white; width: 100%; - height: 100%; - padding-bottom: 70px; + height: calc(100% - 60px); .ucap-video-viewer-video-icon { width: 100%; - height: calc(100% - 60px); + height: calc(100% - 80px); } - .ucap-video-viewer-video-time { - width: 100%; - height: 30px; - } - .ucap-video-viewer-video-controls { - width: 100%; - height: 30px; - - .ucap-video-viewer-video-time-current { - padding-left: 30px; + .viewer-bottom{ + background-color: #212121; + color:#ffffff; + .ucap-video-viewer-video-time { + width: 100%; + height: 30px; } + .ucap-video-viewer-video-controls { + width: 100%; + height: 50px; - .ucap-video-viewer-video-time-total { - padding-right: 30px; + .ucap-video-viewer-video-time-current { + padding-left: 30px; + } + + .ucap-video-viewer-video-time-total { + padding-right: 30px; + } } } } @@ -45,9 +62,22 @@ flex: 1 1 auto; } .ucap-video-viewer-action { + .mat-icon{ + font-size: 40px; + width: 100%; + height: 100%; + line-height:40px; + } } } mat-slider { - width: 95%; + width: 94%; } + +::ng-deep .mat-slider-horizontal .mat-slider-track-background{ + background-color: #999999 !important; +} +::ng-deep .mat-slider-min-value:not(.mat-slider-thumb-label-showing) .mat-slider-thumb{ + border-color: #999999 !important; +} \ No newline at end of file