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 1a00ed04..72bde422 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,46 +188,6 @@ } } } -//mat-snack-bar 공통 -::ng-deep .cdk-global-overlay-wrapper { - .mat-snack-bar-container { - margin: 0; - padding: 30px; - max-width: 60vw; - .mat-simple-snackbar { - display: flex; - justify-content: center; - span { - @include ellipsis(3); - display: inline-block; - padding: 7px 20px; - border: 1px solid #ffffff; - background-color: rgb(255, 255, 255, 0.2); - color: #ffffff; - margin-right: 4px; - flex: 1 1 auto; - max-width: 40vw; - } - &-action { - display: inline-flex; - margin-left: auto; - flex: 0 0 auto; - height: 100%; - button { - //background-color: #00b6d5; - border-radius: 2px; - span { - padding: 0 20px; - color: #ffffff; - background: none; - border: none; - font-weight: 500; - } - } - } - } - } -} .chat-header { .profile-img { 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 c72454f8..066a9418 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 @@ -12,15 +12,3 @@ $tablet-s-width: 768px; margin-right: -10px; } } - -/*rightDrawer공통 -::ng-deep .rightDrawer-item { - width: 100%; - height: calc(100% - 60px); - .rightDrawer-tab { - .mat-tab-label { - width: 50%; - min-width: 50%; - } - } -}*/ 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 e0713d91..b71eb7e3 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 @@ -53,39 +53,3 @@ } } } - -::ng-deep .clipboard-tab { - .mat-tab-header { - width: 160px; - flex: 0 0 160px; - .mat-tab-labels { - flex-direction: column; - justify-content: start; - border: none; - height: 100%; - .mat-tab-label { - padding: 0 10px; - align-content: flex-start; - text-align: left; - align-items: center; - justify-content: flex-start; - .mat-checkbox { - label { - margin-right: 8px; - } - } - } - } - .mat-ink-bar { - display: none; - } - } - - .mat-tab-body-wrapper { - flex: 1 1 auto; - border-left: 1px solid #dddddd; - .mat-tab-body { - padding: 10px; - } - } -} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss index ca132170..22112877 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss @@ -53,33 +53,3 @@ } } } - -::ng-deep .setting-tab { - .mat-tab-header { - border: none !important; - .mat-tab-labels { - flex-direction: column; - justify-content: start; - border: none; - height: 100%; - .mat-tab-label { - padding: 0 10px; - align-content: flex-start; - text-align: left; - align-items: center; - justify-content: flex-start; - &.mat-tab-label-active { - opacity: 1; - } - } - } - .mat-ink-bar { - opacity: 0; - } - } - - .mat-tab-body-wrapper { - flex: 1 1 auto; - border-left: 1px solid #dddddd; - } -} 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 78333f50..8dd59ef1 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -351,10 +351,12 @@ $daesang-grey: ( box-shadow: none; border-radius: 0px; } + .btn-main-float .bg-accent-dark { background: mat-color($accent, 600); color: mat-color($primary, default-contrast); } + .current-head { display: flex; justify-content: center; @@ -389,6 +391,7 @@ $daesang-grey: ( } .mat-tab-body-wrapper { height: 100%; + border: none; } } @@ -401,31 +404,29 @@ $daesang-grey: ( } } - /*mat-tab-group[horizontal] { - &.theme-list { - .mat-tab-label { - flex-direction: row; - } - } - }*/ - mat-tab-group[vertical] { display: flex; flex-direction: row; - .mat-tab-labels { display: flex; flex-direction: column; align-content: flex-start; - .mat-tab-label { justify-content: flex-start; + padding: 0; + .mat-checkbox { + margin-right: 8px; + } } } - .mat-ink-bar { opacity: 0; } + .mat-tab-body-wrapper { + flex: 1 1 auto; + border-left: 1px solid #dddddd; + padding: 0 10px; + } } nav[mat-tab-nav-bar][vertical] { @@ -496,12 +497,35 @@ $daesang-grey: ( } } + //[s] 번역 .translationForm { background-color: mat-color($accent, 200, 0.4); + .select-language { + .mat-form-field-wrapper { + width: 100%; + line-height: 0.8em; + .mat-form-field-infix { + padding: 0.2em 0 0; + } + } + .mat-form-field-underline { + bottom: 0.8em; + } + } + .mat-slide-toggle { + @media screen and (max-width: #{$tablet-s-width}) { + label { + width: 20%; + flex-flow: column; + font-size: 0.8em; + } + } + } } .translation-preview { background-color: mat-color($accent, 900, 0.8); } + .tree-has-child { li { .tree-node-body { diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html index 84195bc1..99a98431 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html @@ -1,6 +1,7 @@
+
+
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 cf69c853..3a35fe4b 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 @@ -7,6 +7,9 @@ .ps--active-x > .ps__rail-x { display: none; } + .write-form { + padding-right: 10px; + } } } @@ -72,7 +75,6 @@ min-height: 250px; border: 1px solid #dddddd; word-break: break-all; - //overflow: auto; } } } @@ -119,8 +121,6 @@ .mat-chip-list { .mat-chip-list-wrapper { margin: 0; - /* max-height: 100px; - overflow: auto;*/ } } .message-title { 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 e50ed777..4422660a 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 @@ -1,4 +1,4 @@ -::ng-deep .organization-tree { +.organization-tree { padding: 5px; .tree-node-closer-container { @@ -65,13 +65,9 @@ border-radius: 4px; button { line-height: normal; - .mat-button-wrapper { - width: 24px; - height: 24px; - .tree-node-expand-btn { - background-color: transparent; - font-size: 20px; - } + .tree-node-expand-btn { + background-color: transparent; + font-size: 20px; } } } 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 3ad95fbb..e166ac8c 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 @@ -26,6 +26,7 @@ ::ng-deep .theme-list { .mat-tab-header { width: 100%; + border: none !important; .mat-tab-labels { position: relative; width: 100%; @@ -45,7 +46,7 @@ } } .mat-tab-body-wrapper { - border: none; + border: none !important; } } 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 07689783..46eca22c 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss @@ -1 +1,40 @@ -$tablet-s-width: 768px; +//mat-snack-bar-container +.cdk-global-overlay-wrapper { + .mat-snack-bar-container { + margin: 0; + padding: 30px; + max-width: 60vw; + .mat-simple-snackbar { + display: flex; + justify-content: center; + span { + @include ellipsis(3); + display: inline-block; + padding: 7px 20px; + border: 1px solid #ffffff; + background-color: rgb(255, 255, 255, 0.2); + color: #ffffff; + margin-right: 4px; + flex: 1 1 auto; + max-width: 40vw; + } + &-action { + display: inline-flex; + margin-left: auto; + flex: 0 0 auto; + height: 100%; + button { + //background-color: #00b6d5; + border-radius: 2px; + span { + padding: 0 20px; + color: #ffffff; + background: none; + border: none; + font-weight: 500; + } + } + } + } + } +} diff --git a/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss index 0da226ea..793f37e8 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss @@ -98,27 +98,3 @@ $tablet-s-width: 768px; } } } - -::ng-deep .translationForm { - .select-language { - .mat-form-field-wrapper { - width: 100%; - line-height: 0.8em; - .mat-form-field-infix { - padding: 0.2em 0 0; - } - } - .mat-form-field-underline { - bottom: 0.8em; - } - } - .mat-slide-toggle { - @media screen and (max-width: #{$tablet-s-width}) { - label { - width: 20%; - flex-flow: column; - font-size: 0.8em; - } - } - } -}