From d1f198574245de922879bc214fb3d6b6d936cbc8 Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 20 Nov 2019 17:31:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=83=81=20=ED=85=8C=EB=A7=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/image/ico_64x64_r.ico | Bin 107599 -> 0 bytes .../src/app/app.theme.scss | 9 +- .../components/left-side.component.scss | 2 - .../left-sidenav/chat.component.scss | 15 ++-- .../left-sidenav/group.component.scss | 8 -- .../left-sidenav/organization.component.scss | 5 +- .../components/messages.component.scss | 4 +- .../right-drawer/album-box.component.html | 35 ++++++-- .../right-drawer/album-box.component.scss | 54 +++++++++--- .../right-drawer/file-box.component.html | 41 +++++++++- .../right-drawer/file-box.component.scss | 52 +++++++++++- .../right-drawer/file-box.component.ts | 2 +- .../room-user-list.component.scss | 1 + .../chat/create-chat.dialog.component.scss | 2 +- .../native/components/top-bar.component.scss | 1 - .../components/main.page.component.html | 2 +- .../components/main.page.component.scss | 11 +-- .../src/assets/scss/global/_default.scss | 77 ++++++++++++++++-- .../message-box/video.component.scss | 2 +- .../lib/components/messages.component.scss | 5 +- .../lib/components/list-item.component.scss | 1 - .../file-upload-queue.component.scss | 17 ++-- 22 files changed, 261 insertions(+), 85 deletions(-) delete mode 100644 electron-projects/ucap-webmessenger-electron/resources/image/ico_64x64_r.ico diff --git a/electron-projects/ucap-webmessenger-electron/resources/image/ico_64x64_r.ico b/electron-projects/ucap-webmessenger-electron/resources/image/ico_64x64_r.ico deleted file mode 100644 index 94ece2ba84eeba718b699cd599e0a518443e73e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107599 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 diff --git a/projects/ucap-webmessenger-app/src/app/app.theme.scss b/projects/ucap-webmessenger-app/src/app/app.theme.scss index 599440de..164de656 100644 --- a/projects/ucap-webmessenger-app/src/app/app.theme.scss +++ b/projects/ucap-webmessenger-app/src/app/app.theme.scss @@ -103,10 +103,13 @@ body.theme-pink-dark { // ----------------------------------------------------------------------------------------------------- // Define the primary, accent and warn palettes -$pink-light-theme-primary-palette: mat-palette($mat-grey,800); -//$pink-light-theme-accent-palette: mat-palette($lg-red, 400); +/*$pink-light-theme-primary-palette: mat-palette($mat-grey,800); +$pink-light-theme-accent-palette: mat-palette($lg-red, 400); +$pink-light-theme-warn-palette: mat-palette($mat-red);*/ + +$pink-light-theme-primary-palette: mat-palette($daesang-grey, 900); $pink-light-theme-accent-palette: mat-palette($daesang); -$pink-light-theme-warn-palette: mat-palette($mat-red); +$pink-light-theme-warn-palette: mat-palette($mat-deep-orange); // Create the Material theme object 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 ddb12bfe..081401ec 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 @@ -38,9 +38,7 @@ height: 100%; } ::ng-deep .global-menu { - border-right: 2px solid #4f4f4f; .mat-tab-label-container { - background-color: #4f4f4f; .mat-tab-list { .mat-tab-labels { flex-flow: column; 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 4e0df8ed..dd3c4550 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 @@ -1,11 +1,4 @@ .current-head { - display: flex; - justify-content: center; - padding: 0 10px; - height: 70px; - background: #352a37; - background: -webkit-linear-gradient(to right, #352a37, #f15f79); - background: linear-gradient(to right, #352a37, #ef4c73); h3 { display: inline-flex; padding-left: 10px; @@ -76,9 +69,17 @@ .app-layout-chat-left-sidenav-chat-list { height: calc(100% - 130px); + position: relative; } .app-layout-chat-left-sidenav-chat-list-viewport { width: 100%; height: 100%; } +::ng-deep .cdk-virtual-scroll-orientation-vertical { + .cdk-virtual-scroll-content-wrapper{ + width: 100%; + height:100%; + contain: unset; + } +} 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 4a173411..6ee241ce 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 @@ -1,13 +1,5 @@ @charset 'utf-8'; .current-head { - display: flex; - justify-content: center; - padding: 0 10px; - height: 70px; - background-color: #eeeeee; - background: #f15f79; - background: -webkit-linear-gradient(to right, #352a37, #f15f79); - background: linear-gradient(to right, #352a37, #ef4c73); color: #ffffff; h3 { display: inline-flex; 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 11cfc5e5..55ccca60 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 @@ -16,7 +16,7 @@ } .current-head { - display: flex; + /*display: flex; justify-content: center; padding: 0 10px; height: 70px; @@ -24,7 +24,7 @@ background: #f15f79; background: -webkit-linear-gradient(to right, #352a37, #f15f79); background: linear-gradient(to right, #352a37, #ef4c73); - color: #ffffff; + color: #ffffff;*/ h3 { display: inline-flex; padding-left: 10px; @@ -83,6 +83,7 @@ display: flex; background-color: #f9f9f9; dt { + font-weight:600; } dd { margin-left: auto; 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 3788c0be..c3cc6dce 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 @@ -45,7 +45,6 @@ width: 40px; height: 40px; border-radius: 50%; - background-color: #604850; color: #efefef; font-size: 16px; line-height: 40px; @@ -97,7 +96,8 @@ position: absolute; padding:10px 10px 0 10px; background-color: rgb(54, 54, 54, 0.8); - bottom:0 + bottom:0; + width:100%; } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html index 01a70e10..b27d2402 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html @@ -6,8 +6,33 @@
- - Select File. + + + +
+ + + + + + Select File. +
+ +
+ + + + + + + + + + + Select File. +
@@ -25,10 +50,10 @@
    -
  • name : {{ selectedFile.info.name }}
    • -
  • size : {{ selectedFile.info.size | ucapBytes }}
    • +
  • {{ selectedFile.info.name }}
    • +
  • size : {{ selectedFile.info.size | ucapBytes }}
  • - date : + date : {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }}
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 1311305c..28271f99 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 @@ -1,3 +1,18 @@ +@mixin ellipsis($row) { + overflow: hidden; + text-overflow: ellipsis; + @if $row == 1 { + display: block; + white-space: nowrap; + word-wrap: normal; + } @else if $row >= 2 { + display: -webkit-box; + -webkit-line-clamp: $row; + -webkit-box-orient: vertical; + word-wrap: break-word; + } +} + .album-box { height: 100%; overflow: hidden; @@ -17,22 +32,32 @@ margin:10px; padding:10px; border:1px solid #cccccc; - .select-flie{ - display: flex; - flex-flow: row; - align-items: center; + .select-file{ color: #212121; - align-items: center; border-bottom: 1px dotted #dddddd; text-align:center; - ul{ - padding:0; - margin-top:10px; - .name{ + padding-bottom:10px; + } + ul{ + padding-top:10px; + li{ + @include ellipsis(1); + &.name{ font-weight:600; } } } + .empty-msg{ + display:inline-flex; + flex-flow: column; + margin:auto 0; + align-items: center; + justify-content: center; + color:#999999; + span{ + padding:6px; + } + } } .search-list{ @@ -41,11 +66,12 @@ height: calc(100% - 450px); overflow-y: auto; flex-wrap: wrap; - justify-content: space-between; .img-item { cursor: pointer; margin-bottom:10px; + margin-right:9px; position: relative; + height: 150px; dl{ dt{ display: flex; @@ -55,6 +81,7 @@ height: 120px; background-color: #efefef; border: 1px dotted #cccccc; + box-sizing: border-box; img{ width:100%; height:100%; @@ -66,14 +93,15 @@ } } } - & :nth-child(3n+0){ + &:nth-child(3n+0){ margin-right:0; } } } -.preview-image { - max-height: 300px; +.preview-image, +.preview-video{ + max-height: 140px; } .btn-box { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html index 5c21477f..3a95280a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html @@ -7,7 +7,13 @@
- Select File. +
+ + + + Select File. +
@@ -21,7 +27,7 @@
    -
  • name : {{ selectedFile.info.name }}
    • +
  • {{ selectedFile.info.name }}
  • size : {{ selectedFile.info.size | ucapBytes }}
  • date : @@ -29,8 +35,35 @@
-
- 아이콘 +
+ + + + + + + + + + + + + + + + + + + + + + + +
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 e7de30c8..c8b8e1ed 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 @@ -28,10 +28,10 @@ } .select-filebox { + position: relative; display: flex; flex-flow: column; margin: 10px; - padding: 10px; border: 1px solid #cccccc; .select-flie { display: flex; @@ -39,6 +39,7 @@ align-items: center; color: #212121; align-items: center; + padding: 10px; border-bottom: 1px dotted #dddddd; ul { padding: 0; @@ -47,6 +48,43 @@ } } } + .empty-msg { + display: inline-flex; + flex-flow: column; + margin: auto 0; + align-items: center; + justify-content: center; + color: #999999; + span { + padding: 6px; + } + } + .select-file-option { + position: absolute; + display: flex; + justify-content: space-between; + width: 100%; + text-align: center; + padding: 10px 0; + bottom: 4px; + span { + width: 28px; + height: 28px; + display: inline-flex; + text-align: center; + justify-content: center; + align-items: center; + margin: 0 20px; + cursor: pointer; + svg { + } + &:hover { + border-radius: 50%; + background-color: #999999; + color: #ffffff !important; + } + } + } } .mat-table { @@ -75,7 +113,7 @@ } } } -.table-box{ +.table-box { height: calc(100% - 450px); overflow-y: auto; } @@ -89,13 +127,14 @@ cursor: pointer; } -.footer-fix{ +.footer-fix { position: absolute; bottom: 0; - height:160px; + height: 160px; flex-direction: column; box-sizing: border-box; display: flex; + border-top: 1px solid #dddddd; .btn-box { height: 50px; padding-bottom: 10px; @@ -128,3 +167,8 @@ order: 5; } } +::ng-deep .mat-form-field-appearance-legacy { + .mat-form-field-infix { + padding: 6px; + } +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts index c7dde43a..6074ed4c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts @@ -207,4 +207,4 @@ export class FileBoxComponent implements OnInit, OnDestroy { onClickRow(row: FileInfoTotal) { this.selectedFile = row; } -} +} \ No newline at end of file diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss index e2de3c17..6cf582e3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss @@ -1,3 +1,4 @@ +@import "../../../../../../../ucap-webmessenger-ui/src/assets/scss/partials/presence"; .list { width: 100%; height: 100%; 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 dc8856aa..ff42ac4f 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 @@ -94,7 +94,7 @@ } } } -.mat-tab-group > .mat-tab-header .mat-tab-label { +::ng-deep .mat-card > .mat-tab-labels { border-bottom: 2px solid #dddddd; } ::ng-deep .ps-content { 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 7f998b9b..c9c35b35 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,6 @@ display: flex; padding: 0 10px; cursor: pointer; - background: #4f4f4f; height: 30px; color:#ffffff; //background: rgba(37, 27, 30, 0.9); diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index dcbfeada..873bc8c0 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -1,4 +1,4 @@ -
+