From 4a46a3e4e0cb2e5a4857afe9d2c7f12d5a6d930a Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 11 Feb 2019 13:54:52 +0000 Subject: [PATCH 1/4] Fix mx_RoomTile_name weighting --- res/css/views/rooms/_RoomTile.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 2024a503ae..20b24a8088 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -157,6 +157,8 @@ limitations under the License. font-weight: 700 !important; .mx_RoomTile_name { + // Parent weighting won't apply to this because the above mx_RoomTile_name overrides. + font-weight: 700; color: $roomtile-selected-color; } } From 56bb6c870adaeb52052c5e66a2a1a5e1ea9ccc09 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Tue, 12 Feb 2019 12:06:23 +0000 Subject: [PATCH 2/4] You are no longer needed --- res/css/views/rooms/_RoomTile.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 20b24a8088..a98a81048d 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -154,8 +154,6 @@ limitations under the License. } .mx_RoomTile_unread, .mx_RoomTile_highlight { - font-weight: 700 !important; - .mx_RoomTile_name { // Parent weighting won't apply to this because the above mx_RoomTile_name overrides. font-weight: 700; From 946a910692578a3d113de82af6c0262a53a05aef Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Tue, 12 Feb 2019 12:06:53 +0000 Subject: [PATCH 3/4] Probably could reduce it to this? --- res/css/views/rooms/_RoomTile.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index a98a81048d..8c0b4a5c14 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -153,12 +153,9 @@ limitations under the License. background-color: $warning-color; } -.mx_RoomTile_unread, .mx_RoomTile_highlight { - .mx_RoomTile_name { - // Parent weighting won't apply to this because the above mx_RoomTile_name overrides. - font-weight: 700; - color: $roomtile-selected-color; - } +.mx_RoomTile_unread, .mx_RoomTile_highlight .mx_RoomTile_name { + font-weight: 700; + color: $roomtile-selected-color; } .mx_RoomTile_selected { From e2cecad535041093f8127c8104f46e894a3fd7af Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Tue, 12 Feb 2019 19:21:31 +0000 Subject: [PATCH 4/4] Update _RoomTile.scss --- res/css/views/rooms/_RoomTile.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 8c0b4a5c14..39071b6f9d 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -153,9 +153,11 @@ limitations under the License. background-color: $warning-color; } -.mx_RoomTile_unread, .mx_RoomTile_highlight .mx_RoomTile_name { - font-weight: 700; - color: $roomtile-selected-color; +.mx_RoomTile_unread, .mx_RoomTile_highlight { + .mx_RoomTile_name { + font-weight: 700; + color: $roomtile-selected-color; + } } .mx_RoomTile_selected {