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

Commit 180f40d

Browse files
turt2liveturt2live
committed
Merge branch 'develop' into travis/modules
2 parents 4b25530 + 5c67ef1 commit 180f40d

File tree

122 files changed

+2050
-1508
lines changed

Some content is hidden

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

122 files changed

+2050
-1508
lines changed

‎__mocks__/maplibre-gl.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
/*
2+
Copyright 2022 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+
117
const EventEmitter = require("events");
2-
const { LngLat, NavigationControl, LngLatBounds } = require('maplibre-gl');
18+
const { LngLat, NavigationControl, LngLatBounds, AttributionControl } = require('maplibre-gl');
319

420
class MockMap extends EventEmitter {
521
addControl = jest.fn();
@@ -27,4 +43,5 @@ module.exports = {
2743
LngLat,
2844
LngLatBounds,
2945
NavigationControl,
46+
AttributionControl,
3047
};

‎cypress/integration/12-spotlight/spotlight.spec.ts‎

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -282,21 +282,41 @@ describe("Spotlight", () => {
282282
cy.openSpotlightDialog().within(() => {
283283
cy.spotlightFilter(Filter.People);
284284
cy.spotlightSearch().clear().type("b");
285-
cy.spotlightResults().should("have.length", 2);
286-
cy.spotlightResults().eq(0).should("have.attr", "aria-selected", "true");
287-
cy.spotlightResults().eq(1).should("have.attr", "aria-selected", "false");
288-
cy.spotlightSearch().type("{downArrow}");
289-
cy.spotlightResults().eq(0).should("have.attr", "aria-selected", "false");
290-
cy.spotlightResults().eq(1).should("have.attr", "aria-selected", "true");
291-
cy.spotlightSearch().type("{downArrow}");
292-
cy.spotlightResults().eq(0).should("have.attr", "aria-selected", "false");
293-
cy.spotlightResults().eq(1).should("have.attr", "aria-selected", "false");
294-
cy.spotlightSearch().type("{upArrow}");
295-
cy.spotlightResults().eq(0).should("have.attr", "aria-selected", "false");
296-
cy.spotlightResults().eq(1).should("have.attr", "aria-selected", "true");
297-
cy.spotlightSearch().type("{upArrow}");
298-
cy.spotlightResults().eq(0).should("have.attr", "aria-selected", "true");
299-
cy.spotlightResults().eq(1).should("have.attr", "aria-selected", "false");
285+
// our debouncing logic only starts the search after a short timeout,
286+
// so we wait a few milliseconds.
287+
cy.wait(300);
288+
cy.get(".mx_Spinner").should("not.exist").then(() => {
289+
cy.spotlightResults().should("have.length", 2).then(() => {
290+
cy.spotlightResults().eq(0)
291+
.should("have.attr", "aria-selected", "true");
292+
cy.spotlightResults().eq(1)
293+
.should("have.attr", "aria-selected", "false");
294+
});
295+
cy.spotlightSearch().type("{downArrow}").then(() => {
296+
cy.spotlightResults().eq(0)
297+
.should("have.attr", "aria-selected", "false");
298+
cy.spotlightResults().eq(1)
299+
.should("have.attr", "aria-selected", "true");
300+
});
301+
cy.spotlightSearch().type("{downArrow}").then(() => {
302+
cy.spotlightResults().eq(0)
303+
.should("have.attr", "aria-selected", "false");
304+
cy.spotlightResults().eq(1)
305+
.should("have.attr", "aria-selected", "false");
306+
});
307+
cy.spotlightSearch().type("{upArrow}").then(() => {
308+
cy.spotlightResults().eq(0)
309+
.should("have.attr", "aria-selected", "false");
310+
cy.spotlightResults().eq(1)
311+
.should("have.attr", "aria-selected", "true");
312+
});
313+
cy.spotlightSearch().type("{upArrow}").then(() => {
314+
cy.spotlightResults().eq(0)
315+
.should("have.attr", "aria-selected", "true");
316+
cy.spotlightResults().eq(1)
317+
.should("have.attr", "aria-selected", "false");
318+
});
319+
});
300320
});
301321
});
302322
});

‎res/css/_common.scss‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -701,15 +701,6 @@ legend {
701701
}
702702
}
703703

704-
@define-mixin mx_Settings_fullWidthField {
705-
margin-right: 100px;
706-
}
707-
708-
@define-mixin mx_Settings_tooltip {
709-
// So it fits in the space provided by the page
710-
max-width: 120px;
711-
}
712-
713704
@define-mixin ProgressBarColour $colour {
714705
color: $colour;
715706
&::-moz-progress-bar {

‎res/css/_components.scss‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
@import "./structures/_ContextualMenu.scss";
3434
@import "./structures/_FileDropTarget.scss";
3535
@import "./structures/_FilePanel.scss";
36-
@import "./structures/_GenericErrorPage.scss";
3736
@import "./structures/_GenericDropdownMenu.scss";
37+
@import "./structures/_GenericErrorPage.scss";
3838
@import "./structures/_HeaderButtons.scss";
3939
@import "./structures/_HomePage.scss";
4040
@import "./structures/_LeftPanel.scss";
@@ -84,7 +84,6 @@
8484
@import "./views/avatars/_DecoratedRoomAvatar.scss";
8585
@import "./views/avatars/_WidgetAvatar.scss";
8686
@import "./views/beta/_BetaCard.scss";
87-
@import "./views/buttons/_Cancel.scss";
8887
@import "./views/context_menus/_CallContextMenu.scss";
8988
@import "./views/context_menus/_DeviceContextMenu.scss";
9089
@import "./views/context_menus/_IconizedContextMenu.scss";
@@ -241,7 +240,6 @@
241240
@import "./views/rooms/_EntityTile.scss";
242241
@import "./views/rooms/_EventBubbleTile.scss";
243242
@import "./views/rooms/_EventTile.scss";
244-
@import "./views/rooms/_GroupLayout.scss";
245243
@import "./views/rooms/_HistoryTile.scss";
246244
@import "./views/rooms/_IRCLayout.scss";
247245
@import "./views/rooms/_JumpToBottomButton.scss";
@@ -274,14 +272,13 @@
274272
@import "./views/rooms/_Stickers.scss";
275273
@import "./views/rooms/_ThreadSummary.scss";
276274
@import "./views/rooms/_TopUnreadMessagesBar.scss";
277-
@import "./views/rooms/_VoiceRecordComposerTile.scss";
278275
@import "./views/rooms/_VideoRoomSummary.scss";
276+
@import "./views/rooms/_VoiceRecordComposerTile.scss";
279277
@import "./views/rooms/_WhoIsTypingTile.scss";
280278
@import "./views/settings/_AvatarSetting.scss";
281279
@import "./views/settings/_CrossSigningPanel.scss";
282280
@import "./views/settings/_CryptographyPanel.scss";
283281
@import "./views/settings/_DevicesPanel.scss";
284-
@import "./views/settings/_E2eAdvancedPanel.scss";
285282
@import "./views/settings/_EmailAddresses.scss";
286283
@import "./views/settings/_FontScalingPanel.scss";
287284
@import "./views/settings/_ImageSizePanel.scss";

‎res/css/rethemendex.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env sh
22

33
cd `dirname $0`
44

‎res/css/structures/_FilePanel.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ limitations under the License.
5555
}
5656
}
5757

58-
.mx_FilePanel .mx_EventTile .mx_MImageBody {
59-
margin-right: 0px;
60-
}
61-
6258
.mx_FilePanel .mx_EventTile .mx_MFileBody {
6359
line-height: 2.4rem;
6460
}

‎res/css/structures/_GenericDropdownMenu.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ limitations under the License.
7272
height: 0;
7373
margin-left: 4px;
7474
margin-right: 19px;
75-
border-top: 1px solid $system;
75+
border-top: 1px solid $quinary-content;
7676
}
7777

7878
.mx_GenericDropdownMenu_Option {
@@ -102,7 +102,7 @@ limitations under the License.
102102

103103
&.mx_GenericDropdownMenu_Option--item {
104104
&:hover {
105-
background-color: $event-selected-color;
105+
background-color: $menu-selected-color;
106106
}
107107

108108
&[aria-checked="true"]::before {

‎res/css/structures/_RoomView.scss‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ limitations under the License.
3232
position: relative;
3333
}
3434

35-
.mx_MainSplit_timeline {
36-
.mx_MessageComposer_wrapper {
37-
margin: $spacing-8 $spacing-16;
38-
}
39-
}
40-
4135
.mx_RoomView_auxPanel {
4236
min-width: 0px;
4337
width: 100%;
@@ -161,7 +155,7 @@ limitations under the License.
161155
.mx_RoomView_messageListWrapper {
162156
justify-content: flex-start;
163157

164-
> .mx_RoomView_MessageList > li > ol {
158+
>.mx_RoomView_MessageList > li > ol {
165159
list-style-type: none;
166160
}
167161
}
@@ -278,6 +272,10 @@ hr.mx_RoomView_myReadMarker {
278272
.mx_MatrixChat_useCompactLayout {
279273
.mx_RoomView_MessageList {
280274
margin-bottom: 4px;
275+
276+
h2 {
277+
margin-top: 6px; // TODO: Use a spacing variable
278+
}
281279
}
282280

283281
.mx_RoomView_statusAreaBox {

‎res/css/structures/_ViewSource.scss‎

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

17-
.mx_ViewSource_separator {
18-
clear: both;
19-
border-bottom: 1px solid #e5e5e5;
20-
padding-top: 0.7em;
21-
padding-bottom: 0.7em;
22-
}
23-
24-
.mx_ViewSource_heading {
25-
font-size: $font-17px;
26-
font-weight: 400;
27-
color: $primary-content;
28-
margin-top: 0.7em;
29-
}
30-
31-
.mx_ViewSource pre {
32-
text-align: left;
33-
font-size: $font-12px;
34-
padding: 0.5em 1em 0.5em 1em;
35-
word-wrap: break-word;
36-
white-space: pre-wrap;
37-
overflow-wrap: anywhere;
38-
}
39-
40-
.mx_ViewSource_details {
41-
margin-top: 0.8em;
42-
}
43-
44-
.mx_ViewSource_container {
45-
max-width: calc(100% - 24px);
46-
}
47-
48-
.mx_ViewSource_container .mx_CopyableText_border {
49-
width: 100%;
17+
.mx_ViewSource {
18+
pre {
19+
font-size: $font-12px;
20+
padding: 0.5em 1em;
21+
word-wrap: break-word;
22+
white-space: pre-wrap;
23+
overflow-wrap: anywhere;
24+
}
25+
26+
.mx_ViewSource_header {
27+
border-bottom: 1px solid $quinary-content;
28+
padding-bottom: $spacing-12;
29+
margin-bottom: $spacing-12;
30+
31+
.mx_CopyableText {
32+
word-break: break-all;
33+
}
34+
}
35+
36+
.mx_ViewSource_heading {
37+
font-size: $font-17px;
38+
font-weight: 400;
39+
color: $primary-content;
40+
margin-top: $spacing-12;
41+
}
42+
43+
.mx_ViewSource_details {
44+
margin-top: $spacing-12;
45+
}
46+
47+
.mx_CopyableText_border {
48+
box-sizing: border-box;
49+
width: 100%;
50+
}
5051
}

‎res/css/views/buttons/_Cancel.scss‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)