Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
cb9f0dde1f
|
@ -17,7 +17,7 @@
|
|||
></ucap-account-change-password>
|
||||
</div>
|
||||
</mat-card-content>
|
||||
<mat-card-actions class="button-farm flex-row">
|
||||
<mat-card-actions class="button-frame flex-row">
|
||||
<button
|
||||
mat-stroked-button
|
||||
(click)="onClickChoice(false)"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .setting-frame {
|
||||
.setting-frame {
|
||||
padding: 16px;
|
||||
height: 100%;
|
||||
min-width: 400px;
|
||||
|
@ -23,7 +23,7 @@
|
|||
border-bottom: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.button-farm {
|
||||
.button-frame {
|
||||
text-align: right;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
|
|
@ -165,20 +165,28 @@ $tablet-s-width: 768px;
|
|||
}
|
||||
}
|
||||
}
|
||||
::ng-deep .bubble-main {
|
||||
word-wrap: break-word;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
a {
|
||||
color: #0367a6;
|
||||
text-decoration: underline;
|
||||
|
||||
::ng-deep .bubble {
|
||||
.bubble-main {
|
||||
word-wrap: break-word;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
a {
|
||||
color: #0367a6;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
.btn-box {
|
||||
min-width: 300px;
|
||||
@media screen and (max-width: #{$tablet-s-width}) {
|
||||
min-width: 250px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep .view-previous {
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
//background-color: rgba(0, 0, 0, 0.4);
|
||||
color: #ffffff;
|
||||
justify-content: center;
|
||||
justify-items: center;
|
||||
|
|
|
@ -128,7 +128,7 @@
|
|||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
::ng-deep .attach-file {
|
||||
.attach-file {
|
||||
display: flex;
|
||||
flex-flow: row;
|
||||
flex: 1 1 auto;
|
||||
|
|
Loading…
Reference in New Issue
Block a user