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-13 14:00:19 +09:00
commit 221974b273
7 changed files with 156 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html
View File

@ -164,11 +164,7 @@
</div> </div>
</perfect-scrollbar> </perfect-scrollbar>
</div> </div>
<div <div class="btn-box"
fxFlex="1 1 50px"
fxLayout="row"
fxLayoutAlign="center center"
class="btn-box"
> >
<button <button
mat-flat-button mat-flat-button

105
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss
View File

@ -17,64 +17,63 @@ $tablet-s-width: 768px;
.rightDrawer-albumbox { .rightDrawer-albumbox {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: calc(100% - 50px);
} .select-filebox {
.select-filebox { display: flex;
display: flex; flex-flow: column;
flex-flow: column; margin: 10px;
margin: 10px; padding: 10px;
padding: 10px; border: 1px solid #cccccc;
border: 1px solid #cccccc; border-radius: 4px;
border-radius: 4px; font-size: 0.9em;
font-size: 0.9em; @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) {
@media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { display: none;
display: none; }
} .select-file {
.select-file { height: 150px;
height: 150px; color: #212121;
color: #212121; border-bottom: 1px dotted #dddddd;
border-bottom: 1px dotted #dddddd; text-align: center;
text-align: center; .guide-msg {
.guide-msg { div {
div { display: flex;
display: flex; flex-flow: column;
flex-flow: column; height: 140px;
height: 140px; justify-content: center;
justify-content: center; justify-items: center;
justify-items: center; color: #999999;
color: #999999; .icon-img {
.icon-img { margin-bottom: 6px;
margin-bottom: 6px; }
} }
} }
} }
} ul {
ul { padding-top: 10px;
padding-top: 10px; li {
li { @include ellipsis(1);
@include ellipsis(1); &.name {
&.name { font-weight: 600;
font-weight: 600; }
}
}
.empty-msg {
display: inline-flex;
flex-flow: column;
margin: auto 0;
align-items: center;
justify-content: center;
color: #999999;
span {
padding: 6px;
} }
} }
} }
.empty-msg {
display: inline-flex;
flex-flow: column;
margin: auto 0;
align-items: center;
justify-content: center;
color: #999999;
span {
padding: 6px;
}
}
} }
.search-list { .search-list {
display: flex; display: flex;
padding: 0 10px; padding: 0 10px;
height: calc(100% - 450px); height: calc(100% - 380px);
@media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) {
margin-top: 10px; margin-top: 10px;
height: calc(100% - 170px); height: calc(100% - 170px);
@ -141,10 +140,18 @@ $tablet-s-width: 768px;
.btn-box { .btn-box {
position: absolute; position: absolute;
bottom: 50px; bottom: 0;
height: 50px; height: 50px;
margin-bottom: 10px; margin-bottom: 10px;
width: 100%; width: 100%;
flex-direction: row;
flex: 1 1 50px;
max-height: 50px;
box-sizing: border-box;
display: flex;
place-content: center;
align-items: center;
button { button {
margin: 5px; margin: 5px;
font-size: 0.9em; font-size: 0.9em;

3
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html
View File

@ -247,9 +247,6 @@
></mat-paginator> ></mat-paginator>
<div <div
fxFlex="1 1 50px"
fxLayout="row"
fxLayoutAlign="center center"
class="btn-box" class="btn-box"
> >
<button <button

140
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss
View File

@ -17,75 +17,75 @@ $tablet-s-width: 768px;
} }
.rightDrawer-filebox { .rightDrawer-filebox {
width: 100%;
height: calc(100% - 60px);
}
.select-filebox {
position: relative; position: relative;
display: flex; width: 100%;
flex-flow: column; height: calc(100% - 50px);
margin: 10px; .select-filebox {
border: 1px solid #cccccc; position: relative;
border-radius: 4px; display: flex;
@media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { flex-flow: column;
display: none; margin: 10px;
} border: 1px solid #cccccc;
.select-filed { border-radius: 4px;
height: calc(100% - 50px); @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) {
overflow-y: auto; display: none;
.select-flie { }
display: flex; .select-filed {
flex-flow: row; height: calc(100% - 50px);
align-items: flex-start; overflow-y: auto;
color: #212121; .select-flie {
padding: 10px; display: flex;
border-bottom: 1px dotted #dddddd; flex-flow: row;
ul { align-items: flex-start;
padding: 0; color: #212121;
.name { padding: 10px;
font-weight: 600; border-bottom: 1px dotted #dddddd;
word-wrap: break-word; ul {
white-space: pre-wrap; padding: 0;
word-break: break-word; .name {
font-weight: 600;
word-wrap: break-word;
white-space: pre-wrap;
word-break: break-word;
}
} }
} }
} }
} .empty-msg {
.empty-msg {
display: inline-flex;
flex-flow: column;
margin: auto 0;
align-items: center;
justify-content: center;
color: #999999;
span {
padding: 6px;
}
}
.select-file-option {
position: absolute;
display: flex;
justify-content: space-between;
width: 100%;
text-align: center;
padding: 10px 0;
bottom: 4px;
span {
width: 28px;
height: 28px;
display: inline-flex; display: inline-flex;
text-align: center; flex-flow: column;
justify-content: center; margin: auto 0;
align-items: center; align-items: center;
margin: 0 20px; justify-content: center;
cursor: pointer; color: #999999;
svg { span {
padding: 6px;
} }
&:hover { }
border-radius: 50%; .select-file-option {
background-color: #999999; position: absolute;
color: #ffffff !important; display: flex;
justify-content: space-between;
width: 100%;
text-align: center;
padding: 10px 0;
bottom: 4px;
span {
width: 28px;
height: 28px;
display: inline-flex;
text-align: center;
justify-content: center;
align-items: center;
margin: 0 20px;
cursor: pointer;
svg {
}
&:hover {
border-radius: 50%;
background-color: #999999;
color: #ffffff !important;
}
} }
} }
} }
@ -135,7 +135,7 @@ $tablet-s-width: 768px;
} }
} }
.table-box { .table-box {
height: calc(100% - 420px); height: calc(100% - 440px);
overflow-y: auto; overflow-y: auto;
@media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) {
height: calc(100% - 146px); height: calc(100% - 146px);
@ -153,15 +153,25 @@ $tablet-s-width: 768px;
bottom: 0; bottom: 0;
min-height: 40px; min-height: 40px;
width: 100%; width: 100%;
height: 170px;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
.btn-box { .btn-box {
position: absolute;
bottom: 0;
height: 50px; height: 50px;
padding-bottom: 10px; margin-bottom: 10px;
width: 100%; width: 100%;
background-color: #ffffff; flex-direction: row;
flex: 1 1 50px;
max-height: 50px;
box-sizing: border-box;
display: flex;
place-content: center;
align-items: center;
button { button {
margin: 5px; margin: 5px;
font-size: 0.9em; font-size: 0.9em;

5
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.html
View File

@ -1,4 +1,4 @@
<div fxLayout="column" class="list"> <div fxLayout="column" class="rightDrawer-userlist">
<div class="search-list"> <div class="search-list">
<perfect-scrollbar class="room-user-scrollbar"> <perfect-scrollbar class="room-user-scrollbar">
<ucap-profile-user-list-item <ucap-profile-user-list-item
@ -13,9 +13,6 @@
</perfect-scrollbar> </perfect-scrollbar>
</div> </div>
<div <div
fxFlex="1 1 50px"
fxLayout="row"
fxLayoutAlign="center center"
class="btn-box" class="btn-box"
> >
<button mat-flat-button class="mat-primary" (click)="onClickAddMember()"> <button mat-flat-button class="mat-primary" (click)="onClickAddMember()">

20
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss
View File

@ -1,12 +1,11 @@
@import '../../../../../../../ucap-webmessenger-ui/src/assets/scss/partials/presence'; @import '../../../../../../../ucap-webmessenger-ui/src/assets/scss/partials/presence';
.list { .rightDrawer-userlist {
position: relative;
width: 100%; width: 100%;
height: 100%; height: calc(100% - 50px);
overflow: hidden;
.search-list { .search-list {
overflow-y: auto; overflow-y: auto;
height: calc(100% - 110px); height: calc(100% - 60px);
} }
} }
@ -16,9 +15,18 @@
height: 50px; height: 50px;
margin-bottom: 10px; margin-bottom: 10px;
width: 100%; width: 100%;
flex-direction: row;
flex: 1 1 50px;
max-height: 50px;
box-sizing: border-box;
display: flex;
place-content: center;
align-items: center;
button { button {
margin: 5px; margin: 5px;
width: 50%;
font-size: 0.9em; font-size: 0.9em;
padding: 0 12px;
min-width: 140px;
} }
} }

28
projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss
View File

@ -225,7 +225,7 @@ $login-max-height: 800px;
} }
} }
::ng-deep .userInfo-call { .userInfo-call {
position: relative; position: relative;
display: flex; display: flex;
flex: 0 0 26px; flex: 0 0 26px;
@ -234,20 +234,18 @@ $login-max-height: 800px;
line-height: 26px; line-height: 26px;
justify-content: center; justify-content: center;
justify-items: center; justify-items: center;
.mat-button-wrapper {
svg {
padding: 0; padding: 0;
margin-top: -4px;
width: 18px; width: 18px;
height: 18px; height: 18px;
justify-content: center; fill: #ffffff;
text-align: center; display: flex;
svg {
fill: #ffffff;
display: flex;
}
} }
} }
::ng-deep .button-text-item { .button-text-item {
display: flex; display: flex;
button { button {
justify-content: center; justify-content: center;
@ -259,20 +257,12 @@ $login-max-height: 800px;
width: 36px; width: 36px;
height: 36px; height: 36px;
flex: 0 0 36px; flex: 0 0 36px;
//line-height: 40px; svg {
.mat-button-wrapper {
padding: 0; padding: 0;
fill: #ffffff; fill: #ffffff;
width: 20px; width: 20px;
height: 20px; height: 20px;
display: inline-flex; display: flex;
justify-content: center;
text-align: center;
svg {
display: flex;
width: 100%;
height: 100%;
}
} }
} }
} }