From 51dc1fe9bf98095136b33ad3623319daa84ccb95 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 3 Jan 2019 18:05:32 -0700 Subject: [PATCH 1/3] Fix badges on room tiles not being right aligned Thanks to Ryan for fixing this! Problem: https://t2l.io/_matrix/media/v1/download/t2l.io/da6fccb60969da1c455630faae990881 --- res/css/views/rooms/_RoomTile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 99a904cebb..c74cec25e3 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -52,7 +52,7 @@ limitations under the License. .mx_RoomTile_nameContainer { display: flex; align-items: center; - width: 180px; + flex: 1; vertical-align: middle; } From 852d6df580e010e3981dc1ee0f29f860e689d3dc Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 3 Jan 2019 18:06:37 -0700 Subject: [PATCH 2/3] Fix composer avatar being an oval when a custom status is set Fixes this: https://t2l.io/_matrix/media/v1/download/t2l.io/0d5c7fa9a4b5bf226a020def8480a887 --- res/css/views/avatars/_MemberStatusMessageAvatar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/avatars/_MemberStatusMessageAvatar.scss b/res/css/views/avatars/_MemberStatusMessageAvatar.scss index c857b9807b..29cae9df34 100644 --- a/res/css/views/avatars/_MemberStatusMessageAvatar.scss +++ b/res/css/views/avatars/_MemberStatusMessageAvatar.scss @@ -17,4 +17,5 @@ limitations under the License. .mx_MemberStatusMessageAvatar_hasStatus { border: 2px solid $accent-color; border-radius: 40px; + padding-right: 0 !important; /* Override AccessibleButton styling */ } From 93ea9d3617ae2273b19805b048d47718ef9932ba Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 3 Jan 2019 18:07:34 -0700 Subject: [PATCH 3/3] Condense .mx_RoomTile_avatar properties Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work. --- res/css/views/rooms/_RoomTile.scss | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index c74cec25e3..70d505e4ea 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -62,11 +62,6 @@ limitations under the License. flex: 1; } -.mx_RoomTile_avatar { - flex: 0; - padding: 4px; -} - .mx_RoomTile_subtext { display: inline-block; font-size: 11px; @@ -84,11 +79,8 @@ limitations under the License. } .mx_RoomTile_avatar { - display: inline-block; - padding-top: 5px; - padding-bottom: 5px; - padding-left: 16px; - padding-right: 6px; + flex: 0; + padding: 4px; width: 24px; vertical-align: middle; }