Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix hidden invite link area except transfer dialog and devtools button area #8165

Closed
wants to merge 12 commits into from
30 changes: 23 additions & 7 deletions res/css/views/dialogs/_DevtoolsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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_content {
overflow-y: auto;
}
}

.mx_DevTools_RoomStateExplorer_query {
Expand Down
35 changes: 32 additions & 3 deletions res/css/views/dialogs/_InviteDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ limitations under the License.
flex-shrink: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
Expand Down Expand Up @@ -295,7 +296,35 @@ 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 {
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;
}
}
}

.mx_InviteDialog_transfer {
Expand All @@ -322,9 +351,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 {
Expand Down