From f53c1a23398b08783d073e9cc8db938318372900 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 26 Mar 2022 10:33:57 +0000 Subject: [PATCH 1/5] Fix hidden invite link area except transfer dialog Signed-off-by: Suguru Hirahara --- res/css/views/dialogs/_InviteDialog.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss index 35fedd7cf28..e7e440005be 100644 --- a/res/css/views/dialogs/_InviteDialog.scss +++ b/res/css/views/dialogs/_InviteDialog.scss @@ -136,6 +136,7 @@ limitations under the License. flex-shrink: 1; overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; } } } @@ -298,6 +299,15 @@ limitations under the License. overflow: hidden; } +.mx_Dialog { + // Disable overflow:hidden on the invite dialog with footer, except the transfer dialog + div:not(.mx_InviteDialog_transfer).mx_InviteDialog_hasFooter { + .mx_InviteDialog_content { + overflow: visible; + } + } +} + .mx_InviteDialog_transfer { width: 496px; height: 466px; @@ -322,9 +332,9 @@ limitations under the License. } .mx_InviteDialog_userSections { - margin-top: 4px; + margin: 4px 0; overflow-y: auto; - padding: 0 45px 4px 0; + padding: 0 45px 0 0; } .mx_InviteDialog_hasFooter .mx_InviteDialog_userSections { From b43d46c22783926cecf9c24e90b835a94849b9e8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 26 Mar 2022 12:39:00 +0000 Subject: [PATCH 2/5] Ensure overflow style is applied properly Signed-off-by: Suguru Hirahara --- res/css/views/dialogs/_InviteDialog.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss index e7e440005be..00e1818a77e 100644 --- a/res/css/views/dialogs/_InviteDialog.scss +++ b/res/css/views/dialogs/_InviteDialog.scss @@ -296,10 +296,13 @@ limitations under the License. .mx_InviteDialog_content { height: calc(100% - 36px); // full height minus the size of the header - overflow: hidden; } .mx_Dialog { + .mx_InviteDialog_content { + overflow: hidden; + } + // Disable overflow:hidden on the invite dialog with footer, except the transfer dialog div:not(.mx_InviteDialog_transfer).mx_InviteDialog_hasFooter { .mx_InviteDialog_content { From 159e8e13f53271c66f824303f65268dce61f7de3 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 7 Apr 2022 20:15:28 +0000 Subject: [PATCH 3/5] Fix the hidden invite link area on .mx_InviteDialog_hasFooter Signed-off-by: Suguru Hirahara --- res/css/views/dialogs/_InviteDialog.scss | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss index 00e1818a77e..19883de6884 100644 --- a/res/css/views/dialogs/_InviteDialog.scss +++ b/res/css/views/dialogs/_InviteDialog.scss @@ -306,7 +306,23 @@ limitations under the License. // Disable overflow:hidden on the invite dialog with footer, except the transfer dialog div:not(.mx_InviteDialog_transfer).mx_InviteDialog_hasFooter { .mx_InviteDialog_content { - overflow: visible; + display: flex; + flex-flow: column; + } + + .mx_InviteDialog_footer { + position: relative; + bottom: 0; + + .mx_CopyableText { + width: 100%; + box-sizing: border-box; + } + } + + .mx_InviteDialog_userSections { + height: 100%; + padding-inline-end: 0; } } } From 3c45bdc5199ecfab9bbd28cd013297b6085c4b65 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 7 Apr 2022 21:17:41 +0000 Subject: [PATCH 4/5] Fix the button overflow on devtools Signed-off-by: Suguru Hirahara --- res/css/views/dialogs/_DevtoolsDialog.scss | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss index ca82b82ee14..b09f57a868b 100644 --- a/res/css/views/dialogs/_DevtoolsDialog.scss +++ b/res/css/views/dialogs/_DevtoolsDialog.scss @@ -20,15 +20,31 @@ limitations under the License. } .mx_Dialog_fixedWidth { - overflow-y: hidden; - height: 100%; + display: flex; + flex-flow: column; + height: 100%; // to put the button on the bottom of the dialog + + .mx_DevTools_content { + margin: 10px 0; + height: 100%; + } + + .mx_Dialog_buttons { + margin-top: 0; + display: flex; + justify-content: flex-end; + gap: 5px 8px; // emulate the margin rules on _common.scss + + button { + box-sizing: border-box; + margin: 0 !important; // override the rules on _common.scss + } + } } } .mx_DevTools_content { - margin: 10px 0; overflow-y: auto; - height: calc(100% - 124px); // 58px for buttons + 50px for header + 8px margin around } .mx_DevTools_RoomStateExplorer_query { From e6bea8698c983421076736396c513a1e7b217748 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 7 Apr 2022 21:19:37 +0000 Subject: [PATCH 5/5] .mx_DevTools_content is under .mx_DevtoolsDialog_wrapper Signed-off-by: Suguru Hirahara --- res/css/views/dialogs/_DevtoolsDialog.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss index b09f57a868b..cc2676713d6 100644 --- a/res/css/views/dialogs/_DevtoolsDialog.scss +++ b/res/css/views/dialogs/_DevtoolsDialog.scss @@ -41,10 +41,10 @@ limitations under the License. } } } -} -.mx_DevTools_content { - overflow-y: auto; + .mx_DevTools_content { + overflow-y: auto; + } } .mx_DevTools_RoomStateExplorer_query {