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

Commit 64e9cdd

Browse files
authored
Fix the header of Space landing page (#8048)
1 parent ed6a371 commit 64e9cdd

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

res/css/structures/_SpaceRoomView.scss

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ $SpaceRoomViewInnerWidth: 428px;
152152
right: 24px;
153153
top: 32px;
154154
}
155+
155156
// XXX remove this when spaces leaves Beta
156157
.mx_SpaceRoomView_preview_spaceBetaPrompt {
157158
font-weight: $font-semi-bold;
@@ -254,13 +255,27 @@ $SpaceRoomViewInnerWidth: 428px;
254255
flex-direction: column;
255256
min-width: 0;
256257

257-
> .mx_BaseAvatar {
258-
width: 80px;
259-
}
258+
.mx_SpaceRoomView_landing_header {
259+
display: flex;
260+
justify-content: space-between;
260261

261-
> .mx_BaseAvatar_image,
262-
> .mx_BaseAvatar > .mx_BaseAvatar_image {
263-
border-radius: 12px;
262+
.mx_BaseAvatar {
263+
width: 80px;
264+
265+
.mx_BaseAvatar_image {
266+
border-radius: 12px;
267+
}
268+
}
269+
270+
// XXX: Temporary for the Spaces release only
271+
.mx_SpaceFeedbackPrompt {
272+
padding: 7px; // 8px - 1px border
273+
border: 1px solid rgba($primary-content, .1);
274+
border-radius: 8px;
275+
width: max-content;
276+
height: fit-content;
277+
margin-left: 24px;
278+
}
264279
}
265280

266281
.mx_SpaceRoomView_landing_name {
@@ -360,14 +375,6 @@ $SpaceRoomViewInnerWidth: 428px;
360375
margin: 0 0 20px;
361376
flex: 0;
362377
}
363-
364-
.mx_SpaceFeedbackPrompt {
365-
padding: 7px; // 8px - 1px border
366-
border: 1px solid rgba($primary-content, .1);
367-
border-radius: 8px;
368-
width: max-content;
369-
margin: 0 0 -40px auto; // collapse its own height to not push other components down
370-
}
371378
}
372379

373380
.mx_SpaceRoomView_privateScope {

res/css/views/spaces/_SpaceCreateMenu.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ $spacePanelWidth: 68px;
4343
color: $secondary-content;
4444
}
4545

46+
// XXX: Temporary for the Spaces release only
4647
.mx_SpaceFeedbackPrompt {
4748
border-top: 1px solid $input-border-color;
4849
padding-top: 12px;
@@ -112,14 +113,13 @@ $spacePanelWidth: 68px;
112113
position: relative;
113114
font-size: inherit;
114115
line-height: inherit;
115-
margin-right: auto;
116+
margin-right: 8px;
116117
}
117118

118119
.mx_AccessibleButton_kind_link {
119120
color: $accent;
120121
position: relative;
121122
padding: 0;
122-
margin-left: 8px;
123123
font-size: inherit;
124124
line-height: inherit;
125125
}

src/components/structures/SpaceRoomView.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,10 @@ const SpaceLanding = ({ space }: { space: Room }) => {
479479
};
480480

481481
return <div className="mx_SpaceRoomView_landing">
482-
<SpaceFeedbackPrompt />
483-
<RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
482+
<div className="mx_SpaceRoomView_landing_header">
483+
<RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
484+
<SpaceFeedbackPrompt />
485+
</div>
484486
<div className="mx_SpaceRoomView_landing_name">
485487
<RoomName room={space}>
486488
{ (name) => {

0 commit comments

Comments
 (0)