From b60c6086d25b11f0359b8b5a306c23f15c3d1b4d Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 12 Feb 2020 14:13:23 +0900 Subject: [PATCH] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(3?= =?UTF-8?q?=EC=B0=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-nav.component.scss | 7 - .../left-sidenav/chat.component.scss | 7 - .../left-sidenav/group.component.scss | 5 +- .../components/right-drawer.component.scss | 57 -------- .../right-drawer/file-box.component.scss | 26 ++++ .../right-drawer/notice.component.scss | 21 --- .../chat/clipboard.dialog.component.scss | 128 ------------------ .../chat/create-chat.dialog.component.scss | 5 - .../group/select-group.dialog.component.html | 1 + .../group/select-group.dialog.component.scss | 5 +- .../messenger-settings.dialog.component.scss | 57 +------- .../lib/components/list-item.component.html | 14 +- .../src/lib/components/write.component.scss | 23 ++-- .../src/lib/components/general.component.scss | 3 + .../src/assets/scss/partials/_icons.scss | 9 ++ .../sticker-selector.component.scss | 1 + 16 files changed, 68 insertions(+), 301 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss index bcd106ec..1fdb3d35 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss @@ -76,13 +76,6 @@ } } -/*::ng-deep .ps { - .ps-content { - position: relative; - width: 100%; - height: 100%; - } -}*/ // perfect-scrollbar right로 2px이동 ::ng-deep .ps__rail-y { & > .ps__thumb-y { 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 a1a17129..54b2eb9b 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 @@ -32,10 +32,3 @@ 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 2d0e09b6..eb66295b 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 @@ -32,10 +32,7 @@ } } } -/*::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/right-drawer.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss index c92d8b0b..5219b909 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss @@ -27,60 +27,3 @@ $tablet-s-width: 768px; } } } - -::ng-deep .footer-fix { - position: absolute; - bottom: 0; - min-height: 40px; - width: 100%; - flex-direction: column; - box-sizing: border-box; - display: flex; - border-top: 1px solid #dddddd; - .btn-box { - height: 50px; - padding-bottom: 10px; - width: 100%; - background-color: #ffffff; - button { - margin: 5px; - font-size: 0.9em; - padding: 0 12px; - } - } - .mat-paginator-page-size { - @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { - display: none; - } - } -} - -/*right-drawer tab 레이아웃 -::ng-deep .rightDrawer-tab { - .mat-tab-labels { - display: flex; - width: 100%; - border-bottom: 2px solid #dddddd; - flex: 1 1 auto; - justify-content: space-around; - width: 100%; - padding: 0; - min-width: 0 !important; - - .mat-tab-label { - width: 50%; - } - } - .mat-tab-header-pagination.mat-tab-header-pagination-disabled { - display: none !important; - } - .message-tab { - position: relative; - height: 100%; - & > .mat-tab-header { - width: 100%; - .mat-tab-label { - min-width: 33%; - } - } -}*/ 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 e1ac7b65..3feca976 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 @@ -148,6 +148,32 @@ $tablet-s-width: 768px; font-size: 1em; } } +.footer-fix { + position: absolute; + bottom: 0; + min-height: 40px; + width: 100%; + flex-direction: column; + box-sizing: border-box; + display: flex; + border-top: 1px solid #dddddd; + .btn-box { + height: 50px; + padding-bottom: 10px; + width: 100%; + background-color: #ffffff; + button { + margin: 5px; + font-size: 0.9em; + padding: 0 12px; + } + } + .mat-paginator-page-size { + @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { + display: none; + } + } +} .mat-paginator-container { display: flex; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss index 499f6d07..d1822359 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss @@ -95,27 +95,6 @@ } } -/*::ng-deep .mat-paginator { - .mat-paginator-container { - justify-content: center; - } - .mat-paginator-navigation-first { - order: 1; - } - .mat-paginator-navigation-previous { - order: 2; - } - // override material paginator page switch - .mat-paginator-range-label { - order: 3; - } - .mat-paginator-navigation-next { - order: 4; - } - .mat-paginator-navigation-last { - order: 5; - } -}*/ .mat-form-field-appearance-legacy { .mat-form-field-infix { padding: 6px; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss index 3e27161c..e0713d91 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss @@ -1,131 +1,3 @@ -/*.clipboard-frame { - padding: 16px; - height: 100%; - min-width: 500px; - position: relative; - - .mat-dialog-container { - position: relative; - } - - .mat-card-header { - position: relative; - width: 100%; - border-bottom: 1px solid #dddddd; - margin-bottom: 12px; - - .btn-dialog-close { - font-size: 20px; - display: flex; - margin-left: auto; - align-self: flex-start; - color: #444444; - } - } - .mat-card-content { - flex: 0 0 auto; - display: flex; - align-items: flex-start; - height: calc(100% - 100px); - border-bottom: 1px solid #dddddd; - .setting-tab { - position: relative; - width: 100%; - height: 100%; - - .title-text { - padding-left: 5px; - } - - .mat-tab-group { - flex-direction: row; - .mat-tab-header { - width: 160px; - .mat-tab-labels { - flex-direction: column; - .mat-tab-label { - padding: 0 10px; - align-content: flex-start; - text-align: left; - align-items: self-start; - justify-content: flex-start; - } - } - .mat-ink-bar { - display: none; - } - } - } - } - } - - .button-farm { - text-align: right; - position: absolute; - width: 100%; - bottom: 10px; - .mat-primary { - margin-left: 4px; - } - } -} - -::ng-deep .clipboard-tab { - .mat-tab-group { - position: relative; - height: 100%; - width: 100%; - - .mat-tab-header { - width: 170px; - flex-flow: column; - border-right: 1px solid #dddddd; - .mat-tab-label-container { - .mat-tab-list { - .mat-tab-labels { - border-bottom: 0; - //padding-right: 10px; - .mat-tab-label { - padding: 0 10px; - } - } - } - } - } - - .mat-tab-body-wrapper { - .mat-tab-body { - .mat-tab-body-conten { - position: relative; - width: 100%; - height: 100%; - .mat-list-base { - position: relative; - } - } - } - } - } -} - -::ng-deep .setting-category { - .mat-list-base { - position: relative; - .mat-list-item { - font-size: 15px; - .mat-tab-header { - border-right: none; - } - } - .mat-divider { - //margin-top: 10px; - } - .mat-subheader { - font-weight: 600; - } - } -} -*/ .clipboard-frame { padding: 16px; 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 c4e4f973..3dbcf3f6 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 @@ -170,8 +170,3 @@ } } } -/*::ng-deep .ps-content { - .cdk-virtual-scroll-viewport { - height: 100%; - } -}*/ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html index 9cb66e91..3f05fc2b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html @@ -16,6 +16,7 @@ add {{ 'group.addNew' | translate }} +
- + + {{ message.title }}
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss index f88cea1f..11aa5f22 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss @@ -91,7 +91,7 @@ } } -::ng-deep .ucap-message-write { +.ucap-message-write { padding: 0; .add-row { display: flex; @@ -100,19 +100,18 @@ margin-bottom: 10px; border-bottom: 1px solid #dddddd; .mat-mini-fab { - .mat-button-wrapper { - padding: 0; - .mat-icon { - width: 40px; - height: 40px; - line-height: 40px; - } - .mat-fab__label { - color: #212121; - margin-left: 10px; - } + .mat-icon { + width: 40px; + height: 40px; + line-height: 40px; + margin-top: -8px; + } + .mat-fab__label { + color: #212121; + margin-left: 10px; } } + .receiver-sum { margin-left: auto; } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss index 2f361eb7..7a6dcf96 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss @@ -77,6 +77,9 @@ .mat-tab-label { width: 140px; height: 120px; + &.mat-tab-label-active { + opacity: 1; + } .mat-tab-label-content { position: relative; flex-flow: column; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss index 9931e3c5..fa019354 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss @@ -54,6 +54,12 @@ mat-icon { height: 24px; line-height: 24px; } + &-30 { + font-size: 30px; + width: 30px; + height: 30px; + line-height: 30px; + } } &:before { display: inline-block; @@ -69,3 +75,6 @@ mat-icon { opacity: 0.7; } } +.circle-button { + border-radius: 50%; +} diff --git a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss index a3aac945..3522e933 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss @@ -21,6 +21,7 @@ $tablet-s-width: 768px; } } } + .sticker-item-box { flex-wrap: wrap; padding: 10px 20px 0;