Merge branch 'develop' into new-guest-access

This commit is contained in:
David Baker 2017-06-06 11:39:47 +01:00
commit e30fcdba4c
57 changed files with 2000 additions and 296 deletions

View file

@ -90,3 +90,17 @@ limitations under the License.
.mx_LeftPanel.collapsed .mx_BottomLeftMenu_settings {
float: none;
}
.mx_MatrixChat_useCompactLayout {
.mx_LeftPanel .mx_BottomLeftMenu {
flex: 0 0 50px;
}
.mx_LeftPanel.collapsed .mx_BottomLeftMenu {
flex: 0 0 160px;
}
.mx_LeftPanel .mx_BottomLeftMenu_options {
margin-top: 12px;
}
}

View file

@ -118,3 +118,14 @@ limitations under the License.
vertical-align: top;
padding-left: 10px
}
.mx_MatrixChat_useCompactLayout {
.mx_RightPanel_footer {
flex: 0 0 50px;
}
.mx_RightPanel_footer .mx_RightPanel_invite {
line-height: 25px;
padding-top: 8px;
}
}