From b71bc885140caf09de94481823a319fc3f4780ff Mon Sep 17 00:00:00 2001 From: Nique Woodhouse Date: Fri, 14 May 2021 09:22:40 +0100 Subject: [PATCH 1/3] Update _RoomSublist.scss Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list. Add background color on hover to RoomSublist buttons to provide more visual feedback. --- res/css/views/rooms/_RoomSublist.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss index 9d52e40819..e467cbafe1 100644 --- a/res/css/views/rooms/_RoomSublist.scss +++ b/res/css/views/rooms/_RoomSublist.scss @@ -98,7 +98,7 @@ limitations under the License. position: relative; width: 24px; height: 24px; - border-radius: 32px; + border-radius: 8px; &::before { content: ''; @@ -114,6 +114,12 @@ limitations under the License. } } + .mx_RoomSublist_auxButton:hover, + .mx_RoomSublist_menuButton:hover { + background:$roomlist-button-bg-color; + } + + // Hide the menu button by default .mx_RoomSublist_menuButton { visibility: hidden; @@ -129,6 +135,7 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/context-menu.svg'); } + .mx_RoomSublist_headerText { flex: 1; max-width: calc(100% - 16px); // 16px is the badge width From 6acf2543f0f43ae8ecf6e28b38b40541c5172cd2 Mon Sep 17 00:00:00 2001 From: Nique Woodhouse Date: Fri, 14 May 2021 10:38:37 +0100 Subject: [PATCH 2/3] Update _RoomSublist.scss Fix indentation and remove random spurious blank line --- res/css/views/rooms/_RoomSublist.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss index e467cbafe1..e507154604 100644 --- a/res/css/views/rooms/_RoomSublist.scss +++ b/res/css/views/rooms/_RoomSublist.scss @@ -114,12 +114,11 @@ limitations under the License. } } - .mx_RoomSublist_auxButton:hover, - .mx_RoomSublist_menuButton:hover { + .mx_RoomSublist_auxButton:hover, + .mx_RoomSublist_menuButton:hover { background:$roomlist-button-bg-color; } - // Hide the menu button by default .mx_RoomSublist_menuButton { visibility: hidden; From 486350cba266df0ae8788ad8b624803bcf61a571 Mon Sep 17 00:00:00 2001 From: Nique Woodhouse Date: Fri, 14 May 2021 10:41:32 +0100 Subject: [PATCH 3/3] Update _RoomSublist.scss --- res/css/views/rooms/_RoomSublist.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss index e507154604..1aafa8da0e 100644 --- a/res/css/views/rooms/_RoomSublist.scss +++ b/res/css/views/rooms/_RoomSublist.scss @@ -116,7 +116,7 @@ limitations under the License. .mx_RoomSublist_auxButton:hover, .mx_RoomSublist_menuButton:hover { - background:$roomlist-button-bg-color; + background: $roomlist-button-bg-color; } // Hide the menu button by default @@ -134,7 +134,6 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/context-menu.svg'); } - .mx_RoomSublist_headerText { flex: 1; max-width: calc(100% - 16px); // 16px is the badge width