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

Commit 10e42d4

Browse files
SimonBrandnerSimonBrandner
committed
Merge remote-tracking branch 'upstream/develop' into fix/rl-resort/110
2 parents 1f98ea4 + 09ffad9 commit 10e42d4

38 files changed

+1190
-827
lines changed

‎.github/workflows/layered-build.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,16 @@ jobs:
1616
path: element-web/webapp
1717
# We'll only use this in a triggered job, then we're done with it
1818
retention-days: 1
19+
- uses: actions/[email protected]
20+
with:
21+
script: |
22+
var fs = require('fs');
23+
fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
24+
- name: Upload PR Info
25+
uses: actions/upload-artifact@v2
26+
with:
27+
name: pr.json
28+
path: pr.json
29+
# We'll only use this in a triggered job, then we're done with it
30+
retention-days: 1
1931

‎.github/workflows/netflify.yaml‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,33 @@ jobs:
3333
});
3434
var fs = require('fs');
3535
fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
36-
- run: unzip previewbuild.zip && rm previewbuild.zip
36+
37+
var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
38+
return artifact.name == "pr.json"
39+
})[0];
40+
var download = await github.actions.downloadArtifact({
41+
owner: context.repo.owner,
42+
repo: context.repo.repo,
43+
artifact_id: prInfoArtifact.id,
44+
archive_format: 'zip',
45+
});
46+
var fs = require('fs');
47+
fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
48+
- name: Extract Artifacts
49+
run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
50+
- name: 'Read PR Info'
51+
id: readctx
52+
uses: actions/[email protected]
53+
with:
54+
script: |
55+
var fs = require('fs');
56+
var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
57+
console.log(`::set-output name=prnumber::${pr.number}`);
3758
- name: Deploy to Netlify
3859
id: netlify
3960
uses: nwtgck/[email protected]
4061
with:
41-
publish-dir: .
62+
publish-dir: webapp
4263
deploy-message: "Deploy from GitHub Actions"
4364
# These don't work because we're in workflow_run
4465
enable-pull-request-comment: false
@@ -47,12 +68,13 @@ jobs:
4768
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
4869
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
4970
timeout-minutes: 1
50-
- name: Comment on PR
51-
uses: phulsechinmay/rewritable-pr-[email protected]
52-
with:
71+
- name: Edit PR Description
72+
uses: velas/pr-[email protected]
73+
env:
5374
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54-
ISSUE_ID: ${{ github.event.workflow_run.pull_requests[0].number }}
55-
message: |
75+
with:
76+
pull-request-number: ${{ steps.readctx.outputs.prnumber }}
77+
description-message: |
5678
Preview: ${{ steps.netlify.outputs.deploy-url }}
5779
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
5880

‎res/css/_components.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
@import "./views/toasts/_IncomingCallToast.scss";
271271
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
272272
@import "./views/verification/_VerificationShowSas.scss";
273+
@import "./views/voip/CallView/_CallViewButtons.scss";
273274
@import "./views/voip/_CallContainer.scss";
274275
@import "./views/voip/_CallPreview.scss";
275276
@import "./views/voip/_CallView.scss";

‎res/css/structures/_SpaceRoomDirectory.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ limitations under the License.
269269
}
270270
}
271271

272-
&:hover {
272+
&:hover, &:focus-within {
273273
background-color: $groupFilterPanel-bg-color;
274274

275275
.mx_AccessibleButton {
@@ -278,6 +278,10 @@ limitations under the License.
278278
}
279279
}
280280

281+
li.mx_SpaceRoomDirectory_roomTileWrapper {
282+
list-style: none;
283+
}
284+
281285
.mx_SpaceRoomDirectory_roomTile,
282286
.mx_SpaceRoomDirectory_subspace_children {
283287
&::before {

‎res/css/views/rooms/_BasicMessageComposer.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ limitations under the License.
6565
font-size: $font-10-4px;
6666
}
6767
}
68+
69+
span.mx_UserPill {
70+
cursor: pointer;
71+
}
72+
73+
span.mx_RoomPill {
74+
cursor: default;
75+
}
6876
}
6977

7078
&.mx_BasicMessageComposer_input_disabled {

‎res/css/views/rooms/_EventTile.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ $hover-select-border: 4px;
489489
// https://github.com/vector-im/vector-web/issues/754
490490
overflow-x: overlay;
491491
overflow-y: visible;
492+
493+
&::-webkit-scrollbar-corner {
494+
background: transparent;
495+
}
492496
}
493497
}
494498

‎res/css/views/voip/CallView/_CallViewButtons.scss‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*
2+
Copyright 2015, 2016 OpenMarket Ltd
3+
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
4+
Copyright 2021 Šimon Brandner <[email protected]>
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
.mx_CallViewButtons {
20+
position: absolute;
21+
display: flex;
22+
justify-content: center;
23+
bottom: 5px;
24+
opacity: 1;
25+
transition: opacity 0.5s;
26+
z-index: 200; // To be above _all_ feeds
27+
28+
&.mx_CallViewButtons_hidden {
29+
opacity: 0.001; // opacity 0 can cause a re-layout
30+
pointer-events: none;
31+
}
32+
33+
.mx_CallViewButtons_button {
34+
cursor: pointer;
35+
margin-left: 2px;
36+
margin-right: 2px;
37+
38+
39+
&::before {
40+
content: '';
41+
display: inline-block;
42+
43+
height: 48px;
44+
width: 48px;
45+
46+
background-repeat: no-repeat;
47+
background-size: contain;
48+
background-position: center;
49+
}
50+
51+
52+
&.mx_CallViewButtons_dialpad::before {
53+
background-image: url('$(res)/img/voip/dialpad.svg');
54+
}
55+
56+
&.mx_CallViewButtons_button_micOn::before {
57+
background-image: url('$(res)/img/voip/mic-on.svg');
58+
}
59+
60+
&.mx_CallViewButtons_button_micOff::before {
61+
background-image: url('$(res)/img/voip/mic-off.svg');
62+
}
63+
64+
&.mx_CallViewButtons_button_vidOn::before {
65+
background-image: url('$(res)/img/voip/vid-on.svg');
66+
}
67+
68+
&.mx_CallViewButtons_button_vidOff::before {
69+
background-image: url('$(res)/img/voip/vid-off.svg');
70+
}
71+
72+
&.mx_CallViewButtons_button_screensharingOn::before {
73+
background-image: url('$(res)/img/voip/screensharing-on.svg');
74+
}
75+
76+
&.mx_CallViewButtons_button_screensharingOff::before {
77+
background-image: url('$(res)/img/voip/screensharing-off.svg');
78+
}
79+
80+
&.mx_CallViewButtons_button_sidebarOn::before {
81+
background-image: url('$(res)/img/voip/sidebar-on.svg');
82+
}
83+
84+
&.mx_CallViewButtons_button_sidebarOff::before {
85+
background-image: url('$(res)/img/voip/sidebar-off.svg');
86+
}
87+
88+
&.mx_CallViewButtons_button_hangup::before {
89+
background-image: url('$(res)/img/voip/hangup.svg');
90+
}
91+
92+
&.mx_CallViewButtons_button_more::before {
93+
background-image: url('$(res)/img/voip/more.svg');
94+
}
95+
96+
&.mx_CallViewButtons_button_invisible {
97+
visibility: hidden;
98+
pointer-events: none;
99+
position: absolute;
100+
}
101+
}
102+
}

‎res/css/views/voip/_CallView.scss‎

Lines changed: 2 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ limitations under the License.
4747
height: 180px;
4848
}
4949

50-
.mx_CallView_callControls {
50+
.mx_CallViewButtons {
5151
bottom: 0px;
5252
}
5353

54-
.mx_CallView_callControls_button {
54+
.mx_CallViewButtons_button {
5555
&::before {
5656
width: 36px;
5757
height: 36px;
@@ -199,20 +199,6 @@ limitations under the License.
199199
}
200200
}
201201

202-
.mx_CallView_callControls {
203-
position: absolute;
204-
display: flex;
205-
justify-content: center;
206-
bottom: 5px;
207-
opacity: 1;
208-
transition: opacity 0.5s;
209-
z-index: 200; // To be above _all_ feeds
210-
}
211-
212-
.mx_CallView_callControls_hidden {
213-
opacity: 0.001; // opacity 0 can cause a re-layout
214-
pointer-events: none;
215-
}
216202

217203
.mx_CallView_presenting {
218204
opacity: 1;
@@ -232,94 +218,3 @@ limitations under the License.
232218
opacity: 0.001; // opacity 0 can cause a re-layout
233219
pointer-events: none;
234220
}
235-
236-
.mx_CallView_callControls_button {
237-
cursor: pointer;
238-
margin-left: 2px;
239-
margin-right: 2px;
240-
241-
242-
&::before {
243-
content: '';
244-
display: inline-block;
245-
246-
height: 48px;
247-
width: 48px;
248-
249-
background-repeat: no-repeat;
250-
background-size: contain;
251-
background-position: center;
252-
}
253-
}
254-
255-
.mx_CallView_callControls_dialpad {
256-
&::before {
257-
background-image: url('$(res)/img/voip/dialpad.svg');
258-
}
259-
}
260-
261-
.mx_CallView_callControls_button_micOn {
262-
&::before {
263-
background-image: url('$(res)/img/voip/mic-on.svg');
264-
}
265-
}
266-
267-
.mx_CallView_callControls_button_micOff {
268-
&::before {
269-
background-image: url('$(res)/img/voip/mic-off.svg');
270-
}
271-
}
272-
273-
.mx_CallView_callControls_button_vidOn {
274-
&::before {
275-
background-image: url('$(res)/img/voip/vid-on.svg');
276-
}
277-
}
278-
279-
.mx_CallView_callControls_button_vidOff {
280-
&::before {
281-
background-image: url('$(res)/img/voip/vid-off.svg');
282-
}
283-
}
284-
285-
.mx_CallView_callControls_button_screensharingOn {
286-
&::before {
287-
background-image: url('$(res)/img/voip/screensharing-on.svg');
288-
}
289-
}
290-
291-
.mx_CallView_callControls_button_screensharingOff {
292-
&::before {
293-
background-image: url('$(res)/img/voip/screensharing-off.svg');
294-
}
295-
}
296-
297-
.mx_CallView_callControls_button_sidebarOn {
298-
&::before {
299-
background-image: url('$(res)/img/voip/sidebar-on.svg');
300-
}
301-
}
302-
303-
.mx_CallView_callControls_button_sidebarOff {
304-
&::before {
305-
background-image: url('$(res)/img/voip/sidebar-off.svg');
306-
}
307-
}
308-
309-
.mx_CallView_callControls_button_hangup {
310-
&::before {
311-
background-image: url('$(res)/img/voip/hangup.svg');
312-
}
313-
}
314-
315-
.mx_CallView_callControls_button_more {
316-
&::before {
317-
background-image: url('$(res)/img/voip/more.svg');
318-
}
319-
}
320-
321-
.mx_CallView_callControls_button_invisible {
322-
visibility: hidden;
323-
pointer-events: none;
324-
position: absolute;
325-
}

0 commit comments

Comments
 (0)