diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html
index c11cfe14..3ba6ea31 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html
@@ -151,17 +151,17 @@
(click)="onClickDetail(message)"
class="message-item"
>
+
+ {{ 'common.noResult' | translate }}
+
-
- {{ 'common.noResult' | translate }}
-
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/notice.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/notice.dialog.component.scss
index 98d2dd17..9aa27060 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/notice.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/notice.dialog.component.scss
@@ -1,27 +1,3 @@
-.mat-card {
- padding: 10px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-title {
- margin: 0 -16px;
- padding-bottom: 10px;
- }
- .btn-dialog-close {
- font-size: 20px;
- display: flex;
- margin-left: auto;
- align-self: flex-start;
- color: #444444;
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
-
form {
.mat-form-field {
width: 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 560c5c02..d9001a9b 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
@@ -133,15 +133,6 @@
line-height: 24px;
}
.confirm-card {
- min-width: 500px;
- .mat-card-header {
- margin-bottom: 10px;
- .mat-card-header-text {
- .mat-card-title {
- margin: 0 -16px;
- }
- }
- }
.mat-card-content {
.content-box {
flex-direction: column;
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss
index a2dabdf2..c9c8d5f1 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss
@@ -11,24 +11,6 @@
}
}
-.confirm-card {
- min-width: 500px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-header-text {
- .mat-card-title {
- margin: 0 -16px;
- }
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
-
form {
div {
padding-bottom: 5px;
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss
index bc6e6b61..17dca270 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss
@@ -11,24 +11,6 @@
}
}
-.confirm-card {
- min-width: 500px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-header-text {
- .mat-card-title {
- margin: 0 -16px;
- }
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
-
.contnets {
max-height: 500px;
word-break: break-word;
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss
index 03bff650..d7966150 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss
@@ -10,23 +10,6 @@
color: #444444;
}
}
-.confirm-card {
- min-width: 500px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-header-text {
- .mat-card-title {
- margin: 0 -16px;
- }
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
form {
.mat-form-field {
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss
index 4c6cd15b..598cfaae 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss
@@ -30,24 +30,6 @@
margin-left: auto;
}
}
-.confirm-card {
- min-width: 500px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-header-text {
- .mat-card-title {
- margin: 0 -16px;
- }
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
-
.contnets {
max-height: 500px;
min-height: 400px;
diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss
index a385a70e..6fd43c94 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss
@@ -334,11 +334,19 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86);
}*/
}
-.mat-card > .notice {
- p {
- margin-bottom: 10px;
+::ng-deep .notice {
+ ol {
+ li {
+ list-style: decimal;
+ margin-bottom: 14px;
+ margin-left: 20px;
+ span {
+ color: #ff5722;
+ }
+ }
}
}
+
@media all and (max-width: 1400px) {
.slider {
&_content {
diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
index abc7f2aa..5c4a0f9e 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
@@ -296,18 +296,19 @@ export class LoginPageComponent implements OnInit, OnDestroy {
NoticeDialogData,
NoticeDialogResult
>(NoticeDialogComponent, {
- width: '500px',
+ width: '600px',
data: {
title: '이용시 주의사항',
html: `
-1. 메신저 계정/비밀번호를 타인에게 공유하지 않아야 합니다.
-2. 회사 중요정보(고객정보 포함)를 업무상 필요한 인원에게 필요한 만큼만 공유해야 합니다.
-3. 퇴근, 회의 등 자리를 비우는 경우 중요자료가 방치되지 않도록 주의하고, Clean Desk를 실천해야 합니다.
-4. 메신저를 누군가 허락 없이 함부로 열람하고 그 내부 내용을 타인과 공유하지 않아야 합니다.
-5. 공용PC에 메신저 사용 후 반드시 로그아웃 하시기 바랍니다.
-6. 사내메신저는 업무용 협업도구입니다. 비업무용 소통을 자제하시기 바랍니다.
-7. 업무상 인지한 정보(개인의 프라이버시 포함)나 일반인에게 공개되지 않은 회사기록을 통해 얻은 정보는 오직 회사의 이익을 위해서 활용하여야 하며 사외에 유출하거나 타인에게 알려주거나 업무 이외의 목적에 사용하여서는 아니 됩니다.
-`
+
+ - 메신저 계정/비밀번호를 타인에게 공유하지 않아야 합니다.
+ - 회사 중요정보(고객정보 포함)를 업무상 필요한 인원에게 필요한 만큼만 공유해야 합니다.
+ - 퇴근, 회의 등 자리를 비우는 경우 중요자료가 방치되지 않도록 주의하고, Clean Desk를 실천해야 합니다.
+ - 메신저를 누군가 허락 없이 함부로 열람하고 그 내부 내용을 타인과 공유하지 않아야 합니다.
+ - 공용PC에 메신저 사용 후 반드시 로그아웃 하시기 바랍니다.
+ - 사내메신저는 업무용 협업도구입니다. 비업무용 소통을 자제하시기 바랍니다.
+ - 업무상 인지한 정보(개인의 프라이버시 포함)나 일반인에게 공개되지 않은 회사기록을 통해 얻은 정보는 오직 회사의 이익을 위해서 활용하여야 하며 사외에 유출하거나 타인에게 알려주거나 업무 이외의 목적에 사용하여서는 아니 됩니다.
+
`
}
});
}
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 395102dc..4580da39 100644
--- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
+++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
@@ -286,7 +286,7 @@ $daesang-grey: (
.mat-tab-group.mat-primary .mat-ink-bar,
body.theme-default .mat-tab-nav-bar.mat-primary .mat-ink-bar {
- background-color: mat-color($accent, 400);
+ background-color: mat-color($accent, 500);
}
.mat-chip.mat-standard-chip.mat-chip-selected.mat-primary {
background-color: mat-color($accent, 700);
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
index 4422660a..8266c1aa 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
@@ -49,8 +49,8 @@
}
.tree-has-child {
- height: 50px;
- min-height: 50px;
+ height: 36px;
+ min-height: 36px;
li {
display: flex;
align-items: center;
@@ -61,13 +61,15 @@
.tree-node-body {
width: 100%;
- height: 40px;
+ height: 30px;
border-radius: 4px;
button {
line-height: normal;
+ width: 30px;
+ height: 30px;
.tree-node-expand-btn {
background-color: transparent;
- font-size: 20px;
+ font-size: 18px;
}
}
}
@@ -75,8 +77,8 @@
}
.tree-no-child {
- height: 50px;
- min-height: 50px;
+ height: 36px;
+ min-height: 36px;
font-size: 13px;
li {
display: flex;
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
index 7517f517..45c55917 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
@@ -1,4 +1,4 @@
-
+
@@ -215,7 +215,7 @@
{{ 'profile.fieldOfficePhoneNumber' | translate }}
-
+
{{
userInfo.lineNumber
| ucapStringFormatterPhone
@@ -250,7 +250,7 @@
{{ 'profile.fieldHandphone' | translate }}
-
+
{{
userInfo.hpNumber | ucapStringFormatterPhone | ucapStringEmptycheck
}}
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss
index 9c0217d6..adbce359 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss
@@ -31,8 +31,9 @@ $login-max-height: 800px;
}
}
-.example-card {
+.mat-card.profile {
display: flex;
+ min-width: 600px;
flex-flow: row;
flex: 0 0 auto;
width: 100%;
@@ -103,6 +104,8 @@ $login-max-height: 800px;
display: flex;
flex-flow: column;
margin-top: 120px;
+ align-items: flex-start;
+ height: 80px;
span {
@include ellipsis(1);
&.name {
@@ -115,7 +118,6 @@ $login-max-height: 800px;
}
}
.mat-card-subtitle {
- margin-left: -16px;
font-size: 1.1em;
flex-flow: column;
span {
@@ -189,9 +191,12 @@ $login-max-height: 800px;
flex: 0 0 auto;
}
dd {
- width: 260px;
margin-right: 20px;
+ width: 100%;
@include ellipsis(1);
+ &.phone-number {
+ width: calc(100% - 100px);
+ }
}
}
}
diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss
index 46eca22c..288a8b12 100644
--- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss
+++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss
@@ -38,3 +38,36 @@
}
}
}
+
+.mat-card {
+ min-width: 500px;
+ padding: 10px;
+ .mat-card-header {
+ margin-bottom: 20px;
+ //.mat-card-header-text,
+ .mat-card-title {
+ display: flex;
+ //margin: 0 -16px;
+ margin-bottom: 0;
+ align-items: center;
+ height: 30px;
+ padding: 0 !important;
+ }
+ .mat-card-header-text {
+ margin: 0;
+ }
+ .btn-dialog-close {
+ font-size: 20px;
+ display: flex;
+ margin-left: auto;
+ align-self: flex-start;
+ color: #444444;
+ }
+ }
+ .button-farm {
+ text-align: right;
+ .mat-primary {
+ margin-left: 4px;
+ }
+ }
+}
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 32762b42..7b572f6f 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
@@ -35,10 +35,7 @@ $line-basic: 1px solid #dddddd;
}
}
}
-.mat-card-header .mat-card-title {
- margin: 0 -16px;
- padding-bottom: 10px;
-}
+
.search-result {
.result-num {
padding: 10px;
diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.scss b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.scss
index d709168b..9aa27060 100644
--- a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.scss
+++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.scss
@@ -1,28 +1,3 @@
-.mat-card {
- padding: 10px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-title {
- margin: 0 -16px;
- padding-bottom: 10px;
- }
-
- .btn-dialog-close {
- font-size: 20px;
- display: flex;
- margin-left: auto;
- align-self: flex-start;
- color: #444444;
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
-
form {
.mat-form-field {
width: 100%;
diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss
index 0605ce89..d7966150 100644
--- a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss
+++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss
@@ -10,22 +10,6 @@
color: #444444;
}
}
-.mat-card {
- padding: 10px;
- .mat-card-header {
- margin-bottom: 20px;
- .mat-card-title {
- margin: 0 -16px;
- padding-bottom: 10px;
- }
- }
- .button-farm {
- text-align: right;
- .mat-primary {
- margin-left: 4px;
- }
- }
-}
form {
.mat-form-field {