Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts: # projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html # projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
This commit is contained in:
parent
d5b6514f48
commit
20614ed4f0
|
@ -8,6 +8,9 @@ body {
|
|||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
min-width: 1160px;
|
||||
min-height: 700px;
|
||||
overflow: auto;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
color: #333;
|
||||
|
|
Loading…
Reference in New Issue
Block a user