From 0005bebdec0fec42c385162d8e90b5df6ce3b987 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 11 Feb 2020 11:09:57 +0900 Subject: [PATCH] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(2?= =?UTF-8?q?=EC=B0=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/group.component.scss | 5 ++--- .../left-sidenav/message.component.scss | 20 +++++++++++++++---- .../components/messages.component.scss | 4 ++-- .../components/login.page.component.scss | 5 +++++ .../components/main.page.component.scss | 2 ++ .../src/lib/components/login.component.scss | 2 +- .../src/lib/components/form.component.scss | 2 +- 7 files changed, 29 insertions(+), 11 deletions(-) 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 311224ed..2d0e09b6 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 @@ -18,7 +18,6 @@ } .search-result { - //height: calc(100% - 130px); overflow: auto; .result-num { padding: 10px; @@ -33,10 +32,10 @@ } } } -::ng-deep .mat-tab-body-content { +/*::ng-deep .mat-tab-body-content { height: 100%; overflow: unset; -} +}*/ .mat-menu-item { display: flex; align-items: center; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss index 91bf62da..216dfd4b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss @@ -18,7 +18,7 @@ .message-item { cursor: pointer; } -::ng-deep .message-box { +.message-box { position: relative; height: 100%; .message-section { @@ -32,9 +32,6 @@ min-width: 33%; } } - .mat-tab-body-wrapper { - height: calc(100% - 50px); - } } .search-sub { padding: 0 20px; @@ -69,3 +66,18 @@ } } } + +//쪽지 local style +::ng-deep .message-box { + .mat-tab-label { + min-width: 33%; + } + .mat-radio-label { + .mat-radio-label-content { + padding-left: 4px; + } + } + .mat-tab-body-wrapper { + height: calc(100% - 50px); + } +} 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 b94312d5..eda01c00 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 @@ -188,7 +188,7 @@ } } } -//mat-snack-bar +//mat-snack-bar 공통 ::ng-deep .cdk-global-overlay-wrapper { .mat-snack-bar-container { margin: 0; @@ -229,7 +229,7 @@ } } -::ng-deep .chat-header { +.chat-header { .profile-img { .chat-timer { .mat-button-wrapper { 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 68733339..3680f742 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 @@ -327,6 +327,11 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86); } } +.mat-card > .notice { + p { + margin-bottom: 10px; + } +} @media all and (max-width: 1400px) { .slider { &_content { 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 5c836fac..c416a80d 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 @@ -20,6 +20,8 @@ .chat-messages { width: 100%; height: 100%; + min-width: 320px; + overflow-x: auto; font-size: 1em; .messenger-statusbar-container { diff --git a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss index 13f0bcc6..b8bfda60 100644 --- a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss +++ b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.scss @@ -83,7 +83,7 @@ $login-max-height: 800px; .submit-button { width: 100%; margin: 0 auto; - margin: 2vh 0 1.6vh; + margin: 1.4vh 0; display: block; } } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss index 48ec081b..50d37040 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss @@ -60,7 +60,7 @@ textarea[name='message'] { ::ng-deep .send-message-button { margin-left: 20px; @media screen and (max-width: #{$tablet-l-width}), (max-height: 800px) { - margin-left: 10px; + margin-left: 6px; } .mat-button-wrapper { display: flex;