From c27eff8475924acd5321a62477776feacd42521b Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 14 Feb 2020 12:05:42 +0900 Subject: [PATCH] no message --- .../messenger/components/left-nav.component.scss | 5 ++--- .../dialogs/chat/clipboard.dialog.component.html | 2 +- .../settings/messenger-settings.dialog.component.html | 2 +- .../src/assets/scss/global/_default.scss | 10 +++++++++- .../src/lib/components/general.component.html | 1 + .../src/lib/components/general.component.scss | 2 +- 6 files changed, 15 insertions(+), 7 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 643be540..a82bbc24 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 @@ -50,7 +50,7 @@ } } &.mat-tab-label-active { - min-width: 0 !important; + opacity: 0; } &[aria-selected='true'] { opacity: 1; @@ -63,8 +63,7 @@ } } .mat-ink-bar { - background-color: none; - height: 0; + opacity: 0; } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html index 733613b4..662b94bd 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html @@ -12,7 +12,7 @@
- + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html index ec3d2e2c..8dfcbc31 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html @@ -12,7 +12,7 @@
- + 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 d240064a..78333f50 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -401,13 +401,21 @@ $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 !important; + flex-direction: column; align-content: flex-start; .mat-tab-label { diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html index 01e12359..76c74c11 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html @@ -18,6 +18,7 @@ animationDuration="0ms" (selectedTabChange)="onSelectedTabChange($event)" fxLayout="row" + horizontal class="theme-list" > 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 a704b4d9..3ad95fbb 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 @@ -29,7 +29,7 @@ .mat-tab-labels { position: relative; width: 100%; - flex-direction: row; + flex-direction: row !important; .mat-tab-label { width: 140px; height: 120px;