From 92586c8556727262f7c5e99a8414513ec5ce44e3 Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Sun, 17 Apr 2022 15:08:03 +0300 Subject: [PATCH 1/6] fixes space kebab menu out of view --- res/css/structures/_SpacePanel.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 1cbc7cd7352..02b42c07de5 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -154,7 +154,7 @@ $activeBorderColor: $primary-content; align-items: center; border-radius: 12px; padding: 4px; - width: calc(100% - 32px); + width: 32px; } .mx_SpaceButton_name { @@ -162,7 +162,7 @@ $activeBorderColor: $primary-content; margin-left: 8px; white-space: nowrap; display: block; - text-overflow: ellipsis; + text-overflow:ellipsis; overflow: hidden; font-size: $font-14px; line-height: $font-18px; @@ -327,13 +327,12 @@ $activeBorderColor: $primary-content; display: block; } } - .mx_SpaceItem:not(.mx_SpaceItem_new) { .mx_SpaceButton:hover, .mx_SpaceButton:focus-within, .mx_SpaceButton_hasMenuOpen { &:not(.mx_SpaceButton_narrow):not(.mx_SpaceButton_invite) .mx_SpaceButton_name { - max-width: calc(100% - 56px); + max-width: calc(100% - 88px); } } } From a722dc4aa253ac4025ae252965bf0148b09e0376 Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Sun, 17 Apr 2022 15:21:37 +0300 Subject: [PATCH 2/6] update-eslint: space kebab menu out of view --- res/css/structures/_SpacePanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 02b42c07de5..f296e7d7b78 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -162,7 +162,7 @@ $activeBorderColor: $primary-content; margin-left: 8px; white-space: nowrap; display: block; - text-overflow:ellipsis; + text-overflow: ellipsis; overflow: hidden; font-size: $font-14px; line-height: $font-18px; From c936130c6ec06c78d819c2d26fdb59de1ddba9ca Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Wed, 20 Apr 2022 22:17:41 +0300 Subject: [PATCH 3/6] update: space kebap menu --- res/css/structures/_SpacePanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index f296e7d7b78..0253839fb23 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -332,7 +332,7 @@ $activeBorderColor: $primary-content; .mx_SpaceButton:focus-within, .mx_SpaceButton_hasMenuOpen { &:not(.mx_SpaceButton_narrow):not(.mx_SpaceButton_invite) .mx_SpaceButton_name { - max-width: calc(100% - 88px); + max-width: calc(100% - 56px); } } } From f36e7e0945c9d02455d0f7dc014cd9252d0b2c5a Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Sun, 24 Apr 2022 19:11:50 +0300 Subject: [PATCH 4/6] update: space panel collapse behavior and kebap menu fix --- res/css/structures/_SpacePanel.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 0253839fb23..5a262760b38 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -34,6 +34,11 @@ $activeBorderColor: $primary-content; // Create another flexbox so the Panel fills the container display: flex; flex-direction: column; + width: 260px; + + &.collapsed{ + width: auto; + } .mx_SpacePanel_toggleCollapse { position: absolute; @@ -128,6 +133,7 @@ $activeBorderColor: $primary-content; min-width: 40px; } + .mx_SpaceButton { border-radius: 8px; display: flex; @@ -154,9 +160,9 @@ $activeBorderColor: $primary-content; align-items: center; border-radius: 12px; padding: 4px; - width: 32px; + width: 32px; } - + .mx_SpaceButton_name { flex: 1; margin-left: 8px; From 1bd5d4983bdb3e466310db2345c251759032864e Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Sun, 24 Apr 2022 19:26:05 +0300 Subject: [PATCH 5/6] update: space panel collapse behavior and kebap menu fix --- res/css/structures/_SpacePanel.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 5a262760b38..6199ea8b488 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -36,7 +36,7 @@ $activeBorderColor: $primary-content; flex-direction: column; width: 260px; - &.collapsed{ + &.collapsed { width: auto; } @@ -133,7 +133,6 @@ $activeBorderColor: $primary-content; min-width: 40px; } - .mx_SpaceButton { border-radius: 8px; display: flex; @@ -160,9 +159,8 @@ $activeBorderColor: $primary-content; align-items: center; border-radius: 12px; padding: 4px; - width: 32px; + width: 32px; } - .mx_SpaceButton_name { flex: 1; margin-left: 8px; From 4d623ea93a23607aac4df0433bffff498acaa855 Mon Sep 17 00:00:00 2001 From: yaya-usman Date: Wed, 27 Apr 2022 12:46:09 +0300 Subject: [PATCH 6/6] updated fix --- res/css/structures/_SpacePanel.scss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 6199ea8b488..9d23dd5fc93 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -34,11 +34,6 @@ $activeBorderColor: $primary-content; // Create another flexbox so the Panel fills the container display: flex; flex-direction: column; - width: 260px; - - &.collapsed { - width: auto; - } .mx_SpacePanel_toggleCollapse { position: absolute; @@ -159,8 +154,10 @@ $activeBorderColor: $primary-content; align-items: center; border-radius: 12px; padding: 4px; - width: 32px; + width: calc(100% - 32px); + min-width: 0; } + .mx_SpaceButton_name { flex: 1; margin-left: 8px; @@ -278,6 +275,7 @@ $activeBorderColor: $primary-content; display: flex; flex-direction: column; max-width: 250px; + min-width: 0; flex-grow: 1; .mx_BaseAvatar:not(.mx_UserMenu_userAvatar_BaseAvatar) .mx_BaseAvatar_initial { @@ -331,6 +329,7 @@ $activeBorderColor: $primary-content; display: block; } } + .mx_SpaceItem:not(.mx_SpaceItem_new) { .mx_SpaceButton:hover, .mx_SpaceButton:focus-within,