From 28a6f4ac0ae6d7373e8890cd4bb29fbe29112a62 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Mon, 6 Jun 2022 01:20:23 +0900 Subject: [PATCH 1/3] Makes the avatar of the user menu non-draggable Signed-off-by: Suguru Hirahara --- res/css/structures/_UserMenu.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss index a88e9eddb90..6bfd66b7171 100644 --- a/res/css/structures/_UserMenu.scss +++ b/res/css/structures/_UserMenu.scss @@ -26,6 +26,10 @@ limitations under the License. .mx_UserMenu_userAvatar { position: relative; + + .mx_BaseAvatar { + pointer-events: none; // makes the avatar non-draggable + } } .mx_UserMenu_name { From eef8bcf743de4066f6b3fbd5ba2cd0043d126279 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Mon, 6 Jun 2022 01:22:03 +0900 Subject: [PATCH 2/3] Include mx_UserMenu_userAvatar in mx_AccessibleButton to clarify the hierarchy Signed-off-by: Suguru Hirahara --- res/css/structures/_UserMenu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss index 6bfd66b7171..ce30ba208ea 100644 --- a/res/css/structures/_UserMenu.scss +++ b/res/css/structures/_UserMenu.scss @@ -22,7 +22,6 @@ limitations under the License. .mx_AccessibleButton { display: flex; align-items: center; - } .mx_UserMenu_userAvatar { position: relative; @@ -31,6 +30,7 @@ limitations under the License. pointer-events: none; // makes the avatar non-draggable } } + } .mx_UserMenu_name { font-weight: $font-semi-bold; From 25e69f649bba620d36352c28ec62497006c83502 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Mon, 6 Jun 2022 01:32:10 +0900 Subject: [PATCH 3/3] yarn run lint:style --fix Signed-off-by: Suguru Hirahara --- res/css/structures/_UserMenu.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss index ce30ba208ea..83dab52d9de 100644 --- a/res/css/structures/_UserMenu.scss +++ b/res/css/structures/_UserMenu.scss @@ -23,14 +23,14 @@ limitations under the License. display: flex; align-items: center; - .mx_UserMenu_userAvatar { - position: relative; + .mx_UserMenu_userAvatar { + position: relative; - .mx_BaseAvatar { - pointer-events: none; // makes the avatar non-draggable + .mx_BaseAvatar { + pointer-events: none; // makes the avatar non-draggable + } } } - } .mx_UserMenu_name { font-weight: $font-semi-bold;