ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2020-02-14 12:31:27 +09:00
commit b9ec6d7425
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss
View File

@ -50,7 +50,7 @@
} }
} }
&.mat-tab-label-active { &.mat-tab-label-active {
min-width: 0 !important; opacity: 0;
} }
&[aria-selected='true'] { &[aria-selected='true'] {
opacity: 1; opacity: 1;
@ -63,8 +63,7 @@
} }
} }
.mat-ink-bar { .mat-ink-bar {
background-color: none; opacity: 0;
height: 0;
} }
} }
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
View File

@ -12,7 +12,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div fxFlex class="clipboard-tab"> <div fxFlex class="clipboard-tab">
<mat-tab-group animationDuration="0ms"> <mat-tab-group animationDuration="0ms" vertical>
<mat-tab *ngIf="data.content.text"> <mat-tab *ngIf="data.content.text">
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-checkbox #chkText> </mat-checkbox> <mat-checkbox #chkText> </mat-checkbox>

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
View File

@ -12,7 +12,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div fxFlex class="setting-tab"> <div fxFlex class="setting-tab">
<mat-tab-group animationDuration="0ms"> <mat-tab-group animationDuration="0ms" vertical>
<mat-tab class="setting"> <mat-tab class="setting">
<ng-template mat-tab-label> <ng-template mat-tab-label>
<span class="mdi mdi-settings"></span> <span class="mdi mdi-settings"></span>

10
projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
View File

@ -401,13 +401,21 @@ $daesang-grey: (
} }
} }
/*mat-tab-group[horizontal] {
&.theme-list {
.mat-tab-label {
flex-direction: row;
}
}
}*/
mat-tab-group[vertical] { mat-tab-group[vertical] {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.mat-tab-labels { .mat-tab-labels {
display: flex; display: flex;
flex-direction: column !important; flex-direction: column;
align-content: flex-start; align-content: flex-start;
.mat-tab-label { .mat-tab-label {

1
projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html
View File

@ -18,6 +18,7 @@
animationDuration="0ms" animationDuration="0ms"
(selectedTabChange)="onSelectedTabChange($event)" (selectedTabChange)="onSelectedTabChange($event)"
fxLayout="row" fxLayout="row"
horizontal
class="theme-list" class="theme-list"
> >
<mat-tab> <mat-tab>

2
projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss
View File

@ -29,7 +29,7 @@
.mat-tab-labels { .mat-tab-labels {
position: relative; position: relative;
width: 100%; width: 100%;
flex-direction: row; flex-direction: row !important;
.mat-tab-label { .mat-tab-label {
width: 140px; width: 140px;
height: 120px; height: 120px;