PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-08-17 18:06:12 +00:00
commit 93848fab53
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file

@ -76,6 +76,10 @@ limitations under the License.
flex: 0 0 auto; flex: 0 0 auto;
} }
.mx_RoomView_auxPanel_apps {
max-width: 1920px ! important;
}
.mx_RoomView_topUnreadMessagesBar { .mx_RoomView_topUnreadMessagesBar {
order: 3; order: 3;
} }

2
src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
View file

@ -43,6 +43,7 @@ limitations under the License.
} }
.mx_AppTile { .mx_AppTile {
max-width: 960px;
width: 50%; width: 50%;
margin: 0 5px 2px 0; margin: 0 5px 2px 0;
border: 1px solid $primary-hairline-color; border: 1px solid $primary-hairline-color;
@ -52,6 +53,7 @@ limitations under the License.
} }
.mx_AppTileFullWidth { .mx_AppTileFullWidth {
max-width: 960px;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;