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

Commit 0c65b9f

Browse files
author
Dariusz Niemczyk
committed
Merge remote-tracking branch 'origin/develop' into palid/19609/fix-room-alias
* origin/develop: (29 commits) Tweak roving tab index focus behaviour (#7254) Fix textual message stripping new line (#7239) Fix broken i18n in Forgot & Change password (#7252) Fix setBotPower to not use `.content` (#7179) Break long words in pinned messages to prevent overflow (#7251) Send read receipts for events in thread's timeline (#7229) Autofocus device panel entry when renaming device (#7249) Fix user menu bottom stroke (#7248) Disallow sending empty feedbacks (#7240) Fix wrongly sized default sub-space icons in space panel (#7243) Hide clear cache and reload button if crash is before client init (#7242) Don't show edit button for hidden edit events (#7226) Update Space Panel scrollable region (#7245) Replace breadcrumbs with recently viewed menu (#7073) Fix automatic space switching wrongly going via Home for room aliases (#7247) Make e2e tests pass in CI by using an older Synapse version (#7246) Make `CallHandler` more `EventEmitter`y (#6704) Fix links being parsed as markdown links improperly (#7200) Tweaks to informational architecture 1.1 (#7052) Upgrade allchange to 1.0.6 (#7238) ...
2 parents 6f567a7 + 68604e3 commit 0c65b9f

File tree

135 files changed

+5979
-2674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+5979
-2674
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
"@typescript-eslint/eslint-plugin": "^4.17.0",
155155
"@typescript-eslint/parser": "^4.17.0",
156156
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
157-
"allchange": "^1.0.5",
157+
"allchange": "^1.0.6",
158158
"babel-jest": "^26.6.3",
159159
"chokidar": "^3.5.1",
160160
"concurrently": "^5.3.0",

res/css/_common.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,15 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
482482
overflow-y: hidden;
483483
}
484484

485+
.mx_DialogDesignChanges_wrapper .mx_Dialog_fixedWidth {
486+
max-width: 636px; // match splash image width
487+
488+
.mx_AccessibleButton_kind_link {
489+
font-size: inherit;
490+
padding: 0;
491+
}
492+
}
493+
485494
// TODO: Review mx_GeneralButton usage to see if it can use a different class
486495
// These classes were brought in from the old UserSettings and are included here to avoid
487496
// breaking the app.

res/css/_components.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@
6060
@import "./views/auth/_Welcome.scss";
6161
@import "./views/avatars/_BaseAvatar.scss";
6262
@import "./views/avatars/_DecoratedRoomAvatar.scss";
63-
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
6463
@import "./views/avatars/_WidgetAvatar.scss";
6564
@import "./views/beta/_BetaCard.scss";
6665
@import "./views/context_menus/_CallContextMenu.scss";
6766
@import "./views/context_menus/_IconizedContextMenu.scss";
6867
@import "./views/context_menus/_MessageContextMenu.scss";
69-
@import "./views/context_menus/_StatusMessageContextMenu.scss";
7068
@import "./views/context_menus/_TagTileContextMenu.scss";
7169
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
7270
@import "./views/dialogs/_AddressPickerDialog.scss";
@@ -145,6 +143,7 @@
145143
@import "./views/elements/_ImageView.scss";
146144
@import "./views/elements/_InfoTooltip.scss";
147145
@import "./views/elements/_InlineSpinner.scss";
146+
@import "./views/elements/_InteractiveTooltip.scss";
148147
@import "./views/elements/_InviteReason.scss";
149148
@import "./views/elements/_ManageIntegsButton.scss";
150149
@import "./views/elements/_MiniAvatarUploader.scss";
@@ -232,11 +231,13 @@
232231
@import "./views/rooms/_NotificationBadge.scss";
233232
@import "./views/rooms/_PinnedEventTile.scss";
234233
@import "./views/rooms/_PresenceLabel.scss";
234+
@import "./views/rooms/_RecentlyViewedButton.scss";
235235
@import "./views/rooms/_ReplyPreview.scss";
236236
@import "./views/rooms/_ReplyTile.scss";
237237
@import "./views/rooms/_RoomBreadcrumbs.scss";
238238
@import "./views/rooms/_RoomHeader.scss";
239239
@import "./views/rooms/_RoomList.scss";
240+
@import "./views/rooms/_RoomListHeader.scss";
240241
@import "./views/rooms/_RoomPreviewBar.scss";
241242
@import "./views/rooms/_RoomSublist.scss";
242243
@import "./views/rooms/_RoomTile.scss";

res/css/structures/_ContextualMenu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ limitations under the License.
2727
width: 100%;
2828
height: 100%;
2929
opacity: 1.0;
30-
z-index: 5000;
3130
}
3231

3332
.mx_ContextualMenu {
@@ -38,6 +37,7 @@ limitations under the License.
3837
position: absolute;
3938
font-size: $font-14px;
4039
z-index: 5001;
40+
width: max-content;
4141
}
4242

4343
.mx_ContextualMenu_right {

res/css/structures/_LeftPanel.scss

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,40 @@ $roomListCollapsedWidth: 68px;
101101
}
102102

103103
.mx_LeftPanel_filterContainer {
104-
margin-left: 12px;
105-
margin-right: 12px;
104+
margin: 0 12px;
105+
padding: 12px 0 8px;
106+
border-bottom: 1px solid $quinary-content;
106107

107108
flex-shrink: 0; // to convince safari's layout engine the flexbox is fine
108109

109110
// Create a flexbox to organize the inputs
110111
display: flex;
111112
align-items: center;
112113

114+
& + .mx_RoomListHeader {
115+
margin-top: 12px;
116+
}
117+
118+
.mx_RoomSearch_shortcutPrompt {
119+
border-radius: 6px;
120+
background-color: $panel-actions;
121+
padding: 2px 4px;
122+
user-select: none;
123+
pointer-events: none;
124+
font-size: $font-12px;
125+
line-height: $font-15px;
126+
font-weight: $font-semi-bold;
127+
color: $light-fg-color;
128+
margin-right: 6px;
129+
}
130+
113131
.mx_RoomSearch_focused, .mx_RoomSearch_hasQuery {
114-
& + .mx_LeftPanel_exploreButton {
132+
.mx_RoomSearch_shortcutPrompt {
133+
display: none;
134+
}
135+
136+
& + .mx_LeftPanel_exploreButton,
137+
& + .mx_LeftPanel_recentsButton {
115138
// Cheaty way to return the occupied space to the filter input
116139
flex-basis: 0;
117140
margin: 0;
@@ -144,11 +167,12 @@ $roomListCollapsedWidth: 68px;
144167
mask-position: center;
145168
mask-size: contain;
146169
mask-repeat: no-repeat;
147-
background: $secondary-content;
170+
background-color: $secondary-content;
148171
}
149172
}
150173

151-
.mx_LeftPanel_exploreButton {
174+
.mx_LeftPanel_exploreButton,
175+
.mx_LeftPanel_recentsButton {
152176
width: 32px;
153177
height: 32px;
154178
border-radius: 8px;
@@ -163,17 +187,28 @@ $roomListCollapsedWidth: 68px;
163187
left: 8px;
164188
width: 16px;
165189
height: 16px;
166-
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
167190
mask-position: center;
168191
mask-size: contain;
169192
mask-repeat: no-repeat;
170-
background: $secondary-content;
193+
background-color: $secondary-content;
171194
}
172195

173-
&.mx_LeftPanel_exploreButton_space::before {
174-
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
196+
&:hover {
197+
background-color: $tertiary-content;
198+
199+
&::before {
200+
background-color: $background;
201+
}
175202
}
176203
}
204+
205+
.mx_LeftPanel_exploreButton::before {
206+
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
207+
}
208+
209+
.mx_LeftPanel_recentsButton::before {
210+
mask-image: url('$(res)/img/element-icons/clock.svg');
211+
}
177212
}
178213

179214
.mx_LeftPanel_roomListFilterCount {
@@ -231,10 +266,10 @@ $roomListCollapsedWidth: 68px;
231266
background-color: transparent;
232267
}
233268

234-
.mx_LeftPanel_exploreButton {
269+
.mx_LeftPanel_exploreButton,
270+
.mx_LeftPanel_recentsButton {
235271
margin-left: 0;
236272
margin-top: 8px;
237-
background-color: transparent;
238273
}
239274
}
240275
}

res/css/structures/_QuickSettingsButton.scss

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,34 @@ limitations under the License.
1616

1717
.mx_QuickSettingsButton {
1818
flex: 0 0 auto;
19-
width: 32px;
20-
height: 32px;
2119
border-radius: 8px;
2220
position: relative;
2321
margin: 12px auto;
22+
color: $secondary-content;
23+
min-width: 32px;
24+
min-height: 32px;
25+
line-height: 32px;
26+
27+
&.expanded {
28+
margin-left: 20px;
29+
padding-left: 44px; // align with toggle collapse button text
30+
padding-right: 8px;
31+
}
2432

2533
&::before {
2634
content: "";
2735
position: absolute;
28-
width: inherit;
29-
height: inherit;
36+
width: 32px;
37+
height: 32px;
38+
left: 0;
3039
mask-image: url('$(res)/img/element-icons/settings.svg');
3140
mask-repeat: no-repeat;
3241
mask-position: center;
3342
mask-size: 16px;
3443
background: $secondary-content;
3544
}
3645

37-
&:hover {
46+
&:not(.expanded):hover {
3847
background-color: $quaternary-content;
3948

4049
&::before {

res/css/structures/_RightPanel.scss

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,44 +103,61 @@ limitations under the License.
103103
mask-position: center;
104104
}
105105

106-
$dot-size: 8px;
106+
$dot-size: 7px;
107107
$pulse-color: $alert;
108108

109109
.mx_RightPanel_pinnedMessagesButton {
110110
&::before {
111111
mask-image: url('$(res)/img/element-icons/room/pin.svg');
112112
mask-position: center;
113113
}
114+
}
115+
.mx_RightPanel_headerButton_unreadIndicator_bg {
116+
position: absolute;
117+
right: 0;
118+
top: 0;
119+
margin: 4px;
120+
width: $dot-size;
121+
height: $dot-size;
122+
border-radius: 50%;
123+
transform: scale(1.6);
124+
transform-origin: center center;
125+
background: rgba($background, 1);
126+
}
114127

115-
.mx_RightPanel_pinnedMessagesButton_unreadIndicator {
128+
.mx_RightPanel_headerButton_unreadIndicator {
129+
position: absolute;
130+
right: 0;
131+
top: 0;
132+
margin: 4px;
133+
width: $dot-size;
134+
height: $dot-size;
135+
border-radius: 50%;
136+
transform: scale(1);
137+
background: rgba($pulse-color, 1);
138+
box-shadow: 0 0 0 0 rgba($pulse-color, 1);
139+
animation: mx_RightPanel_indicator_pulse 2s infinite;
140+
animation-iteration-count: 1;
141+
142+
&.mx_Indicator_gray {
143+
background: rgba($input-darker-fg-color, 1);
144+
box-shadow: rgba($input-darker-fg-color, 1);
145+
}
146+
147+
&::after {
148+
content: "";
116149
position: absolute;
117-
right: 0;
150+
width: inherit;
151+
height: inherit;
118152
top: 0;
119-
margin: 4px;
120-
width: $dot-size;
121-
height: $dot-size;
122-
border-radius: 50%;
153+
left: 0;
123154
transform: scale(1);
124-
background: rgba($pulse-color, 1);
125-
box-shadow: 0 0 0 0 rgba($pulse-color, 1);
126-
animation: mx_RightPanel_indicator_pulse 2s infinite;
127-
animation-iteration-count: 1;
128-
129-
&::after {
130-
content: "";
131-
position: absolute;
132-
width: inherit;
133-
height: inherit;
134-
top: 0;
135-
left: 0;
136-
transform: scale(1);
137-
transform-origin: center center;
138-
animation-name: mx_RightPanel_indicator_pulse_shadow;
139-
animation-duration: inherit;
140-
animation-iteration-count: inherit;
141-
border-radius: 50%;
142-
background: rgba($pulse-color, 1);
143-
}
155+
transform-origin: center center;
156+
animation-name: mx_RightPanel_indicator_pulse_shadow;
157+
animation-duration: inherit;
158+
animation-iteration-count: inherit;
159+
border-radius: 50%;
160+
background: inherit;
144161
}
145162
}
146163

res/css/structures/_RoomSearch.scss

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,22 @@ limitations under the License.
6767
.mx_RoomSearch_clearButton {
6868
width: 16px;
6969
height: 16px;
70-
mask-image: url('$(res)/img/element-icons/roomlist/search-clear.svg');
71-
mask-position: center;
72-
mask-size: contain;
73-
mask-repeat: no-repeat;
74-
background-color: $secondary-content;
7570
margin-right: 8px;
71+
background-color: $quinary-content;
72+
border-radius: 50%;
73+
position: relative;
74+
75+
&::before {
76+
content: "";
77+
position: absolute;
78+
width: inherit;
79+
height: inherit;
80+
mask-image: url('$(res)/img/feather-customised/x.svg');
81+
mask-position: center;
82+
mask-size: 12px;
83+
mask-repeat: no-repeat;
84+
background-color: $secondary-content;
85+
}
7686
}
7787
}
7888

@@ -82,13 +92,20 @@ limitations under the License.
8292
}
8393

8494
&.mx_RoomSearch_minimized {
85-
border-radius: 32px;
8695
height: auto;
8796
width: auto;
88-
padding: 8px;
97+
padding: 5px;
8998

9099
.mx_RoomSearch_icon {
91100
margin-left: 0;
92101
}
102+
103+
&:hover {
104+
background-color: $tertiary-content;
105+
106+
.mx_RoomSearch_icon {
107+
background-color: $background;
108+
}
109+
}
93110
}
94111
}

0 commit comments

Comments
 (0)