그룹
-
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 da7e49cf..7f998b9b 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
@@ -7,15 +7,13 @@
right: 0;
top: 0;
display: flex;
- padding-left: 5px;
- padding-right: 0px;
- // align-items: center;
- // justify-content: center;
- // flex-direction: row-reverse;
+ padding: 0 10px;
cursor: pointer;
- background: white;
+ background: #4f4f4f;
height: 30px;
- border-bottom: 1px solid #d5dadb;
+ color:#ffffff;
+ //background: rgba(37, 27, 30, 0.9);
+ //border-bottom: 1px solid #d5dadb;
.app-layout-native-title-bar-logo {
width: 16px;
@@ -39,7 +37,7 @@
outline: 0;
cursor: pointer;
border: none;
- height: 100%;
+ height: 30px;
min-width: 30px;
max-width: 30px;
padding: 5px;
@@ -49,7 +47,9 @@
transition: background 0.2s linear, color 0.2s linear;
text-align: center;
font-size: 10px;
-
+ vertical-align: middle;
+ margin-left:6px;
+ transform: translateY(-2px);
.mat-icon {
//transform: translateY(-2px);
width: 16px;
@@ -62,7 +62,7 @@
&.app-layout-native-title-bar-close,
&.app-layout-native-title-bar-maximize,
&.app-layout-native-title-bar-minimize {
- color: black;
+ color: darken(white, 20%);
font-weight: lighter;
}
@@ -72,18 +72,18 @@
&:hover {
&.app-layout-native-title-bar-close {
- background: #e81123;
- color: darken(white, 20%);
+ background: darken(#000000, 10%);
+ color: darken(white, 0);
}
&.app-layout-native-title-bar-minimize {
background: darken(#000000, 10%);
- color: darken(white, 20%);
+ color: darken(white,0);
}
&.app-layout-native-title-bar-maximize {
background: darken(#000000, 10%);
- color: darken(white, 20%);
+ color: darken(white, 0);
}
}
}
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 6e3937f8..5842b92c 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
@@ -3,6 +3,8 @@
display: flex;
flex-flow: row;
padding-top: 30px;
+ border:3px solid #4f4f4f;
+ border-top:none;
.left-side {
width: 380px;
@@ -14,7 +16,7 @@
flex: 1 1 auto;
min-width: 400px;
height: 100%;
-
+
.messages {
width: 100%;
height: 100%;
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 94a7ed95..2c4f7b13 100644
--- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
+++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
@@ -51,7 +51,8 @@ $lg-red: (
200: #f48fb1,
300: #f06292,
400: #ef4c73,
- /* 400: #ec407a,*/ 500: #ed097e,
+ /* 400: #ec407a,*/
+ 500: #ed097e,
600: #d81b60,
700: #c2185b,
800: #ad1457,
@@ -98,7 +99,7 @@ $lg-red: (
color: mat-color($primary, default-contrast);
}
.bg-accent-light {
- background: mat-color($accent, 300);
+ background: mat-color($accent, 300) !important;
color: mat-color($primary, default-contrast);
}
.bg-accent-color {
@@ -127,10 +128,6 @@ $lg-red: (
.mat-chip.mat-standard-chip.mat-chip-selected.mat-primary {
background-color: mat-color($accent, 200);
}
- /*.mat-form-field-appearance-legacy .mat-hint{
- color: mat-color($accent, 800);
- }*/
-
.mat-form-field-appearance-legacy {
.mat-form-field-label {
color: mat-color($primary);
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
index a221b900..0f901130 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
@@ -160,11 +160,11 @@ $meBox-bg: #ffffff;
position: relative;
display: flex;
flex-direction: row;
- margin-right:40px;
- margin-left:0;
+ margin-right: 40px;
+ margin-left: 0;
.profile-img {
flex: 0 0 auto;
- img{
+ img {
border-radius: 50%;
}
}
@@ -172,8 +172,8 @@ $meBox-bg: #ffffff;
&.me {
.chat-row {
flex-direction: row-reverse;
- margin-left:40px;
- margin-right:0;
+ margin-left: 40px;
+ margin-right: 0;
.profile-info {
flex-direction: row-reverse;
display: flex;
@@ -283,8 +283,8 @@ $meBox-bg: #ffffff;
}
}
}
-.bubble-main{
- word-wrap: break-word;
- white-space: pre-wrap;
- word-break: keep-all;
+.bubble-main {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ word-break: keep-all;
}
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 0891b625..8397c09d 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
@@ -6,7 +6,6 @@
.more-spacer {
flex: 1 1 auto;
- width: 20px;
}
}
@@ -14,7 +13,6 @@
padding: 0;
}
.mat-expansion-panel-header {
- //height: 40px !important;
padding: 0 20px;
.mat-expansion-panel-header-title {
align-items: center;
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.scss
index e76c6db1..23dc7611 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.scss
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.scss
@@ -20,6 +20,7 @@
align-items: center;
padding: 0 10px 0 20px;
font-size: 14px;
+ background-color:#f9f9f9;
border-bottom: 1px solid #dddddd;
.selectbox {
display: inline-flex;
@@ -52,4 +53,4 @@
+ .searchbox {
width: 54%;
display: inline-flex;
-}
+}
\ No newline at end of file
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 b5446a51..ec84f926 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
@@ -107,7 +107,7 @@ $thumbnail-msize: 40px;
display: flex;
margin: 0;
padding: 0;
- width: calc(100% - 50px);
+ width: calc(100% - 60px);
.detail {
flex-direction: column;
width: calc(100% - 80px);
@@ -116,6 +116,7 @@ $thumbnail-msize: 40px;
color: $font-dark;
width: 100%;
margin-bottom: 2px;
+ align-items: center;
.name {
font-size: 16px;
@include ellipsis(1);
@@ -130,11 +131,16 @@ $thumbnail-msize: 40px;
font-size: 16px;
color: #666666;
margin-left: 4px;
+ line-height:unset;
}
.num {
font-size: 12px;
flex: none;
margin-left: 6px;
+ border-radius: 3px;
+ padding: 1px 6px;
+ background-color: #ef4c73;
+ color: #ffffff;
}
}
.room-msg {
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.html b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.html
index 480436d3..031357e1 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.html
+++ b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.html
@@ -4,7 +4,7 @@
(click)="onToggleFab()"
>