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

New right panel: fix button alignment in memberlist #11861

Merged
merged 1 commit into from
Nov 13, 2023
Merged

New right panel: fix button alignment in memberlist #11861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion res/css/views/right_panel/_BaseCard.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ limitations under the License.
display: flex;
align-items: center;
justify-content: space-between;
width: calc(100% - 38px);
height: 24px;
flex: 1;

Expand Down Expand Up @@ -157,6 +156,7 @@ limitations under the License.

.mx_BaseCard_back,
.mx_BaseCard_close {
flex-shrink: 0;
position: relative;
background-color: var(--cpd-color-bg-subtle-secondary);
width: var(--BaseCard_header-button-size);
Expand Down Expand Up @@ -226,3 +226,7 @@ limitations under the License.
}
}
}

.mx_BaseCard_headerProp {
flex: 1 1 100%;
}
4 changes: 0 additions & 4 deletions res/css/views/right_panel/_RoomSummaryCard.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,6 @@ limitations under the License.

.mx_RoomSummaryCard_header {
padding: 15px 12px;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to _BaseCard

.mx_BaseCard_close {
flex-shrink: 0;
}
}

.mx_RoomSummaryCard_search input {
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/right_panel/BaseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const BaseCard: React.FC<IProps> = forwardRef<HTMLDivElement, IProps>(
<div className="mx_BaseCard_header">
{backButton}
{closeButton}
{header}
<div className="mx_BaseCard_headerProp">{header}</div>
</div>
)}
{children}
Expand Down
32 changes: 18 additions & 14 deletions test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,26 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
title="Close"
/>
<div
class="mx_BaseCard_header_title"
class="mx_BaseCard_headerProp"
>
<h4
class="mx_Heading_h4 mx_BaseCard_header_title_heading"
>
Example 1
</h4>
<div
aria-expanded="false"
aria-haspopup="true"
aria-label="Options"
class="mx_AccessibleButton mx_BaseCard_header_title_button--option"
role="button"
tabindex="0"
title="Options"
/>
class="mx_BaseCard_header_title"
>
<h4
class="mx_Heading_h4 mx_BaseCard_header_title_heading"
>
Example 1
</h4>
<div
aria-expanded="false"
aria-haspopup="true"
aria-label="Options"
class="mx_AccessibleButton mx_BaseCard_header_title_button--option"
role="button"
tabindex="0"
title="Options"
/>
</div>
</div>
</div>
<div
Expand Down
6 changes: 5 additions & 1 deletion test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
tabindex="0"
title="Close"
/>
<span />
<div
class="mx_BaseCard_headerProp"
>
<span />
</div>
</div>
<div
class="mx_AutoHideScrollbar"
Expand Down
Loading