Merge branch 'master' into moving-styles

This commit is contained in:
elastalink
2019-04-08 01:19:02 -04:00
committed by GitHub
36 changed files with 1058 additions and 1673 deletions

View File

@@ -180,7 +180,7 @@
margin: 0;
padding: 0 15px;
background-color: #fff;
max-height: calc(100vh - 111px);
/*max-height: calc(100vh - 111px);*/
min-width: unset;
}
.room4submenu {
@@ -188,7 +188,7 @@
}
.fullscreen #column_l {
height: calc(100vh - 135px);
height: calc(100vh - 111px);
width: calc(100% - 30px);
overflow-y: auto;
}