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-06 15:19:24 +09:00
commit 9325c7ff8f
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
View File

@ -173,19 +173,42 @@
} }
} }
} }
//mat-snack-bar
::ng-deep .cdk-global-overlay-wrapper { ::ng-deep .cdk-global-overlay-wrapper {
.mat-snack-bar-container { .mat-snack-bar-container {
margin: 0; margin: 0;
padding: 30px; padding: 30px;
max-width: 60vw;
.mat-simple-snackbar { .mat-simple-snackbar {
display: flex;
justify-content: center; justify-content: center;
span { span {
@include ellipsis(1); @include ellipsis(3);
padding: 10px 40px; display: inline-block;
padding: 7px 20px;
border: 1px solid #ffffff; border: 1px solid #ffffff;
background-color: rgb(255, 255, 255, 0.2); background-color: rgb(255, 255, 255, 0.2);
color: #ffffff; 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;
}
}
} }
} }
} }

11
projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss
View File

@ -90,7 +90,7 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86);
background-size: auto 133.3333%; background-size: auto 133.3333%;
background-position: center; background-position: center;
background-repeat: none; background-repeat: none;
transform: scale(0.70); transform: scale(0.7);
transition: transform $time/4 $ease-in-out, box-shadow $time/4 $ease-in-out, transition: transform $time/4 $ease-in-out, box-shadow $time/4 $ease-in-out,
opacity $time/4 step-end; opacity $time/4 step-end;
opacity: 0; opacity: 0;
@ -327,6 +327,15 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86);
} }
} }
.mat-card-content {
.notice {
p {
line-height: 1.4em;
margin-bottom: 10px;
}
}
}
@media all and (max-width: 1400px) { @media all and (max-width: 1400px) {
.slider { .slider {
&_content { &_content {

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

@ -446,6 +446,12 @@ $daesang-grey: (
.list-item { .list-item {
&.selected { &.selected {
background-color: mat-color($accent, 100); background-color: mat-color($accent, 100);
border-right: 2px solid mat-color($accent, 800);
}
}
.mat-simple-snackbar-action {
button {
background-color: mat-color($accent, 500);
} }
} }
} }