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 94ece2ba..00000000
Binary files a/electron-projects/ucap-webmessenger-electron/resources/image/ico_64x64_r.ico and /dev/null differ
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.
+
- - 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 @@
-