Merge branch 'master' into develop

2019-02-15 13:53:29 +01:00 · 2019-02-15 13:53:29 +01:00 · 7ce8ab0fd0
commit 7ce8ab0fd0
parent b19a1a0188 c8fa30d8ee
5 changed files with 28 additions and 15 deletions
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@ -191,3 +191,7 @@ limitations under the License.
 .mx_RoomTile.mx_RoomTile_transparent:focus {
    background-color: $roomtile-transparent-focused-color;
 }
+
+.mx_GroupInviteTile .mx_RoomTile_name {
+    flex: 1;
+}