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

Commit 9eb0986

Browse files
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
� Conflicts: � src/i18n/strings/en_EN.json
2 parents a3ca2ab + 7c9df71 commit 9eb0986

33 files changed

+660
-357
lines changed

res/css/_components.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
6868
@import "./views/dialogs/_AddressPickerDialog.scss";
6969
@import "./views/dialogs/_Analytics.scss";
70-
@import "./views/dialogs/_BetaFeedbackDialog.scss";
7170
@import "./views/dialogs/_BugReportDialog.scss";
7271
@import "./views/dialogs/_ChangelogDialog.scss";
7372
@import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@@ -82,12 +81,14 @@
8281
@import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
8382
@import "./views/dialogs/_FeedbackDialog.scss";
8483
@import "./views/dialogs/_ForwardDialog.scss";
84+
@import "./views/dialogs/_GenericFeatureFeedbackDialog.scss";
8585
@import "./views/dialogs/_GroupAddressPicker.scss";
8686
@import "./views/dialogs/_HostSignupDialog.scss";
8787
@import "./views/dialogs/_IncomingSasDialog.scss";
8888
@import "./views/dialogs/_InviteDialog.scss";
8989
@import "./views/dialogs/_JoinRuleDropdown.scss";
9090
@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
91+
@import "./views/dialogs/_LeaveSpaceDialog.scss";
9192
@import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
9293
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
9394
@import "./views/dialogs/_ModalWidgetDialog.scss";

res/css/structures/_SpaceHierarchy.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ limitations under the License.
4646

4747
.mx_AccessibleButton_kind_link {
4848
padding: 0;
49+
font-size: inherit;
4950
}
5051

5152
.mx_SearchBox {

res/css/structures/_SpaceRoomView.scss

Lines changed: 5 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -335,24 +335,17 @@ $SpaceRoomViewInnerWidth: 428px;
335335
word-wrap: break-word;
336336
}
337337

338-
> hr {
339-
border: none;
340-
height: 1px;
341-
background-color: $groupFilterPanel-bg-color;
342-
}
343-
344338
.mx_SearchBox {
345339
margin: 0 0 20px;
346340
flex: 0;
347341
}
348342

349343
.mx_SpaceFeedbackPrompt {
350-
margin-bottom: 16px;
351-
352-
// hide the HR as we have our own
353-
& + hr {
354-
display: none;
355-
}
344+
padding: 7px; // 8px - 1px border
345+
border: 1px solid $menu-border-color;
346+
border-radius: 8px;
347+
width: max-content;
348+
margin: 0 0 -40px auto; // collapse its own height to not push other components down
356349
}
357350
}
358351

@@ -508,66 +501,3 @@ $SpaceRoomViewInnerWidth: 428px;
508501
}
509502
}
510503
}
511-
512-
.mx_SpaceFeedbackPrompt {
513-
margin-top: 18px;
514-
margin-bottom: 12px;
515-
516-
> hr {
517-
border: none;
518-
border-top: 1px solid $input-border-color;
519-
margin-bottom: 12px;
520-
}
521-
522-
> div {
523-
display: flex;
524-
flex-direction: row;
525-
font-size: $font-15px;
526-
line-height: $font-24px;
527-
528-
> span {
529-
color: $secondary-fg-color;
530-
position: relative;
531-
padding-left: 32px;
532-
font-size: inherit;
533-
line-height: inherit;
534-
margin-right: auto;
535-
536-
&::before {
537-
content: '';
538-
position: absolute;
539-
left: 0;
540-
top: 2px;
541-
height: 20px;
542-
width: 20px;
543-
background-color: $secondary-fg-color;
544-
mask-repeat: no-repeat;
545-
mask-size: contain;
546-
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
547-
mask-position: center;
548-
}
549-
}
550-
551-
.mx_AccessibleButton_kind_link {
552-
color: $accent-color;
553-
position: relative;
554-
padding: 0 0 0 24px;
555-
margin-left: 8px;
556-
font-size: inherit;
557-
line-height: inherit;
558-
559-
&::before {
560-
content: '';
561-
position: absolute;
562-
left: 0;
563-
height: 16px;
564-
width: 16px;
565-
background-color: $accent-color;
566-
mask-repeat: no-repeat;
567-
mask-size: contain;
568-
mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
569-
mask-position: center;
570-
}
571-
}
572-
}
573-
}

res/css/views/dialogs/_AddExistingToSpaceDialog.scss

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,6 @@ limitations under the License.
5050
line-height: $font-15px;
5151
}
5252

53-
.mx_AddExistingToSpace_entry {
54-
display: flex;
55-
margin-top: 12px;
56-
57-
.mx_DecoratedRoomAvatar, // we can't target .mx_BaseAvatar here as it'll break the decorated avatar styling
58-
.mx_BaseAvatar.mx_RoomAvatar_isSpaceRoom {
59-
margin-right: 12px;
60-
}
61-
62-
img.mx_RoomAvatar_isSpaceRoom,
63-
.mx_RoomAvatar_isSpaceRoom img {
64-
border-radius: 8px;
65-
}
66-
67-
.mx_AddExistingToSpace_entry_name {
68-
font-size: $font-15px;
69-
line-height: 30px;
70-
flex-grow: 1;
71-
overflow: hidden;
72-
white-space: nowrap;
73-
text-overflow: ellipsis;
74-
margin-right: 12px;
75-
}
76-
77-
.mx_Checkbox {
78-
align-items: center;
79-
}
80-
}
81-
8253
.mx_AccessibleButton_kind_link {
8354
font-size: $font-12px;
8455
line-height: $font-15px;
@@ -255,3 +226,32 @@ limitations under the License.
255226
line-height: $font-24px;
256227
}
257228
}
229+
230+
.mx_AddExistingToSpace_entry {
231+
display: flex;
232+
margin-top: 12px;
233+
234+
.mx_DecoratedRoomAvatar, // we can't target .mx_BaseAvatar here as it'll break the decorated avatar styling
235+
.mx_BaseAvatar.mx_RoomAvatar_isSpaceRoom {
236+
margin-right: 12px;
237+
}
238+
239+
img.mx_RoomAvatar_isSpaceRoom,
240+
.mx_RoomAvatar_isSpaceRoom img {
241+
border-radius: 8px;
242+
}
243+
244+
.mx_AddExistingToSpace_entry_name {
245+
font-size: $font-15px;
246+
line-height: 30px;
247+
flex-grow: 1;
248+
overflow: hidden;
249+
white-space: nowrap;
250+
text-overflow: ellipsis;
251+
margin-right: 12px;
252+
}
253+
254+
.mx_Checkbox {
255+
align-items: center;
256+
}
257+
}

res/css/views/dialogs/_BetaFeedbackDialog.scss renamed to res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_BetaFeedbackDialog {
18-
.mx_BetaFeedbackDialog_subheading {
17+
.mx_GenericFeatureFeedbackDialog {
18+
.mx_GenericFeatureFeedbackDialog_subheading {
1919
color: $primary-fg-color;
2020
font-size: $font-14px;
2121
line-height: $font-20px;
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
/*
2+
Copyright 2021 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
.mx_LeaveSpaceDialog_wrapper {
18+
.mx_Dialog {
19+
display: flex;
20+
flex-direction: column;
21+
padding: 24px 32px;
22+
}
23+
}
24+
25+
.mx_LeaveSpaceDialog {
26+
width: 440px;
27+
display: flex;
28+
flex-direction: column;
29+
flex-wrap: nowrap;
30+
max-height: 520px;
31+
32+
.mx_Dialog_content {
33+
flex-grow: 1;
34+
margin: 0;
35+
overflow-y: auto;
36+
37+
.mx_RadioButton + .mx_RadioButton {
38+
margin-top: 16px;
39+
}
40+
41+
.mx_SearchBox {
42+
// To match the space around the title
43+
margin: 0 0 15px 0;
44+
flex-grow: 0;
45+
border-radius: 8px;
46+
}
47+
48+
.mx_LeaveSpaceDialog_noResults {
49+
display: block;
50+
margin-top: 24px;
51+
}
52+
53+
.mx_LeaveSpaceDialog_section {
54+
margin: 16px 0;
55+
}
56+
57+
.mx_LeaveSpaceDialog_section_warning {
58+
position: relative;
59+
border-radius: 8px;
60+
margin: 12px 0 0;
61+
padding: 12px 8px 12px 42px;
62+
background-color: $header-panel-bg-color;
63+
64+
font-size: $font-12px;
65+
line-height: $font-15px;
66+
color: $secondary-fg-color;
67+
68+
&::before {
69+
content: '';
70+
position: absolute;
71+
left: 10px;
72+
top: calc(50% - 8px); // vertical centering
73+
height: 16px;
74+
width: 16px;
75+
background-color: $secondary-fg-color;
76+
mask-repeat: no-repeat;
77+
mask-size: contain;
78+
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
79+
mask-position: center;
80+
}
81+
}
82+
83+
> p {
84+
color: $primary-fg-color;
85+
}
86+
}
87+
88+
.mx_Dialog_buttons {
89+
margin-top: 20px;
90+
91+
.mx_Dialog_primary {
92+
background-color: $notice-primary-color !important; // override default colour
93+
border-color: $notice-primary-color;
94+
}
95+
}
96+
}

res/css/views/messages/_CallEvent.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
background-color: $dark-panel-bg-color;
2424
border-radius: 8px;
2525
margin: 10px auto;
26-
max-width: 75%;
26+
width: 75%;
2727
box-sizing: border-box;
2828
height: 60px;
2929

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,22 @@ limitations under the License.
3838
padding-top: 0;
3939
}
4040

41+
&::before {
42+
content: '';
43+
position: absolute;
44+
top: -1px;
45+
bottom: -1px;
46+
left: -60px;
47+
right: -60px;
48+
z-index: -1;
49+
border-radius: 4px;
50+
}
51+
4152
&:hover,
4253
&.mx_EventTile_selected {
54+
4355
&::before {
44-
content: '';
45-
position: absolute;
46-
top: -1px;
47-
bottom: -1px;
48-
left: -60px;
49-
right: -60px;
50-
z-index: -1;
5156
background: $eventbubble-bg-hover;
52-
border-radius: 4px;
5357
}
5458

5559
.mx_EventTile_avatar {
@@ -276,6 +280,11 @@ limitations under the License.
276280
margin-right: 5px;
277281
}
278282

283+
.mx_EventTile_line,
284+
.mx_EventTile_info {
285+
min-width: 100%;
286+
}
287+
279288
.mx_EventTile_e2eIcon {
280289
margin-left: 9px;
281290
}
@@ -288,9 +297,9 @@ limitations under the License.
288297
}
289298

290299
.mx_EventListSummary[data-layout=bubble] {
291-
--maxWidth: 80%;
300+
--maxWidth: 70%;
292301
margin-left: calc(var(--avatarSize) + var(--gutterSize));
293-
margin-right: calc(var(--gutterSize) + var(--avatarSize));
302+
margin-right: 94px;
294303
.mx_EventListSummary_toggle {
295304
float: none;
296305
margin: 0;

res/css/views/rooms/_EventTile.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ $hover-select-border: 4px;
5959
font-size: $font-14px;
6060
display: inline-block; /* anti-zalgo, with overflow hidden */
6161
overflow: hidden;
62-
cursor: pointer;
6362
padding-bottom: 0px;
6463
padding-top: 0px;
6564
margin: 0px;
@@ -322,6 +321,10 @@ $hover-select-border: 4px;
322321
// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
323322
}
324323

324+
.mx_SenderProfile {
325+
cursor: pointer;
326+
}
327+
325328
.mx_EventTile_bubbleContainer {
326329
display: grid;
327330
grid-template-columns: 1fr 100px;

0 commit comments

Comments
 (0)