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

Commit db951b4

Browse files
t3chguyt3chguy
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2 parents f7818e0 + 6eed09f commit db951b4

40 files changed

+1173
-681
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Layered Preview Build
2+
on:
3+
pull_request:
4+
branches: [develop]
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Build
11+
run: scripts/ci/layered.sh && cd element-web && cp element.io/develop/config.json config.json && CI_PACKAGE=true yarn build
12+
- name: Upload Artifact
13+
uses: actions/upload-artifact@v2
14+
with:
15+
name: previewbuild
16+
path: element-web/webapp
17+
# We'll only use this in a triggered job, then we're done with it
18+
retention-days: 1
19+

‎.github/workflows/netflify.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Upload Preview Build to Netlify
2+
on:
3+
workflow_run:
4+
workflows: ["Layered Preview Build"]
5+
types:
6+
- completed
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
if: >
11+
${{ github.event.workflow_run.conclusion == 'success' }}
12+
steps:
13+
# There's a 'download artifact' action but it hasn't been updated for the
14+
# workflow_run action (https://github.com/actions/download-artifact/issues/60)
15+
# so instead we get this mess:
16+
- name: 'Download artifact'
17+
uses: actions/[email protected]
18+
with:
19+
script: |
20+
var artifacts = await github.actions.listWorkflowRunArtifacts({
21+
owner: context.repo.owner,
22+
repo: context.repo.repo,
23+
run_id: ${{github.event.workflow_run.id }},
24+
});
25+
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
26+
return artifact.name == "previewbuild"
27+
})[0];
28+
var download = await github.actions.downloadArtifact({
29+
owner: context.repo.owner,
30+
repo: context.repo.repo,
31+
artifact_id: matchArtifact.id,
32+
archive_format: 'zip',
33+
});
34+
var fs = require('fs');
35+
fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
36+
- run: unzip previewbuild.zip && rm previewbuild.zip
37+
- name: Deploy to Netlify
38+
uses: nwtgck/[email protected]
39+
with:
40+
publish-dir: .
41+
github-token: ${{ secrets.GITHUB_TOKEN }}
42+
deploy-message: "Deploy from GitHub Actions"
43+
enable-pull-request-comment: true
44+
enable-commit-comment: false
45+
overwrites-pull-request-comment: true
46+
env:
47+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
48+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
49+
timeout-minutes: 1
50+

‎.github/workflows/preview_changelog.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Preview Changelog
2+
on:
3+
pull_request_target:
4+
types: [ opened, edited, labeled ]
5+
jobs:
6+
changelog:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Preview Changelog
10+
uses: matrix-org/allchange@main
11+
with:
12+
ghToken: ${{ secrets.GITHUB_TOKEN }}

‎res/css/_components.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@
241241
@import "./views/settings/_E2eAdvancedPanel.scss";
242242
@import "./views/settings/_EmailAddresses.scss";
243243
@import "./views/settings/_IntegrationManager.scss";
244+
@import "./views/settings/_LayoutSwitcher.scss";
244245
@import "./views/settings/_Notifications.scss";
245246
@import "./views/settings/_PhoneNumbers.scss";
246247
@import "./views/settings/_ProfileSettings.scss";
@@ -274,6 +275,7 @@
274275
@import "./views/voip/_CallPreview.scss";
275276
@import "./views/voip/_CallView.scss";
276277
@import "./views/voip/_CallViewForRoom.scss";
278+
@import "./views/voip/_CallViewHeader.scss";
277279
@import "./views/voip/_CallViewSidebar.scss";
278280
@import "./views/voip/_DialPad.scss";
279281
@import "./views/voip/_DialPadContextMenu.scss";

‎res/css/views/elements/_DesktopCapturerSourcePicker.scss‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@ limitations under the License.
2424
align-items: flex-start;
2525
height: 500px;
2626
overflow: overlay;
27-
}
28-
29-
.mx_desktopCapturerSourcePicker_source {
30-
display: flex;
31-
flex-direction: column;
32-
margin: 8px;
33-
}
3427

35-
.mx_desktopCapturerSourcePicker_source_thumbnail {
36-
margin: 4px;
37-
padding: 4px;
38-
border-width: 2px;
39-
border-radius: 8px;
40-
border-style: solid;
41-
border-color: transparent;
42-
43-
&.mx_desktopCapturerSourcePicker_source_thumbnail_selected,
44-
&:hover,
45-
&:focus {
46-
border-color: $accent-color;
28+
.mx_desktopCapturerSourcePicker_source {
29+
width: 50%;
30+
display: flex;
31+
flex-direction: column;
32+
33+
.mx_desktopCapturerSourcePicker_source_thumbnail {
34+
margin: 4px;
35+
padding: 4px;
36+
border-width: 2px;
37+
border-radius: 8px;
38+
border-style: solid;
39+
border-color: transparent;
40+
41+
&.mx_desktopCapturerSourcePicker_source_thumbnail_selected,
42+
&:hover,
43+
&:focus {
44+
border-color: $accent-color;
45+
}
46+
}
47+
48+
.mx_desktopCapturerSourcePicker_source_name {
49+
margin: 0 4px;
50+
white-space: nowrap;
51+
text-overflow: ellipsis;
52+
overflow: hidden;
53+
}
4754
}
4855
}
49-
50-
.mx_desktopCapturerSourcePicker_source_name {
51-
margin: 0 4px;
52-
white-space: nowrap;
53-
text-overflow: ellipsis;
54-
overflow: hidden;
55-
}
5656
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
height: 28px;
2121
border: 2px solid $voice-record-stop-border-color;
2222
border-radius: 32px;
23-
margin-right: 16px; // between us and the send button
23+
margin-right: 8px; // between us and the waveform component
2424
position: relative;
2525

2626
&::after {
@@ -64,6 +64,10 @@ limitations under the License.
6464
.mx_MessageComposer_row .mx_VoiceMessagePrimaryContainer {
6565
// Note: remaining class properties are in the PlayerContainer CSS.
6666

67+
// fixed height to reduce layout jumps with the play button appearing
68+
// https://github.com/vector-im/element-web/issues/18431
69+
height: 32px;
70+
6771
margin: 6px; // force the composer area to put a gutter around us
6872
margin-right: 12px; // isolate from stop/send button
6973

@@ -83,7 +87,7 @@ limitations under the License.
8387
height: 10px;
8488
position: absolute;
8589
left: 12px; // 12px from the left edge for container padding
86-
top: 16px; // vertically center (middle align with clock)
90+
top: 17px; // vertically center (middle align with clock)
8791
border-radius: 10px;
8892
}
8993
}

‎res/css/views/settings/_LayoutSwitcher.scss‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
3+
Copyright 2021 Šimon Brandner <[email protected]>
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
18+
.mx_LayoutSwitcher {
19+
.mx_LayoutSwitcher_RadioButtons {
20+
display: flex;
21+
flex-direction: row;
22+
gap: 24px;
23+
24+
color: $primary-fg-color;
25+
26+
> .mx_LayoutSwitcher_RadioButton {
27+
flex-grow: 0;
28+
flex-shrink: 1;
29+
display: flex;
30+
flex-direction: column;
31+
32+
width: 300px;
33+
34+
border: 1px solid $appearance-tab-border-color;
35+
border-radius: 10px;
36+
37+
.mx_EventTile_msgOption,
38+
.mx_MessageActionBar {
39+
display: none;
40+
}
41+
42+
.mx_LayoutSwitcher_RadioButton_preview {
43+
flex-grow: 1;
44+
display: flex;
45+
align-items: center;
46+
padding: 10px;
47+
pointer-events: none;
48+
}
49+
50+
.mx_RadioButton {
51+
flex-grow: 0;
52+
padding: 10px;
53+
}
54+
55+
.mx_EventTile_content {
56+
margin-right: 0;
57+
}
58+
59+
&.mx_LayoutSwitcher_RadioButton_selected {
60+
border-color: $accent-color;
61+
}
62+
}
63+
64+
.mx_RadioButton {
65+
border-top: 1px solid $appearance-tab-border-color;
66+
67+
> input + div {
68+
border-color: rgba($muted-fg-color, 0.2);
69+
}
70+
}
71+
72+
.mx_RadioButton_checked {
73+
background-color: rgba($accent-color, 0.08);
74+
}
75+
76+
.mx_EventTile {
77+
margin: 0;
78+
&[data-layout=bubble] {
79+
margin-right: 40px;
80+
}
81+
&[data-layout=irc] {
82+
> a {
83+
display: none;
84+
}
85+
}
86+
.mx_EventTile_line {
87+
max-width: 90%;
88+
}
89+
}
90+
}
91+
}

‎res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2020 The Matrix.org Foundation C.I.C.
2+
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -155,79 +155,6 @@ limitations under the License.
155155
margin-left: calc($font-16px + 10px);
156156
}
157157

158-
.mx_AppearanceUserSettingsTab_Layout_RadioButtons {
159-
display: flex;
160-
flex-direction: row;
161-
gap: 24px;
162-
163-
color: $primary-fg-color;
164-
165-
> .mx_AppearanceUserSettingsTab_Layout_RadioButton {
166-
flex-grow: 0;
167-
flex-shrink: 1;
168-
display: flex;
169-
flex-direction: column;
170-
171-
width: 300px;
172-
173-
border: 1px solid $appearance-tab-border-color;
174-
border-radius: 10px;
175-
176-
.mx_EventTile_msgOption,
177-
.mx_MessageActionBar {
178-
display: none;
179-
}
180-
181-
.mx_AppearanceUserSettingsTab_Layout_RadioButton_preview {
182-
flex-grow: 1;
183-
display: flex;
184-
align-items: center;
185-
padding: 10px;
186-
pointer-events: none;
187-
}
188-
189-
.mx_RadioButton {
190-
flex-grow: 0;
191-
padding: 10px;
192-
}
193-
194-
.mx_EventTile_content {
195-
margin-right: 0;
196-
}
197-
198-
&.mx_AppearanceUserSettingsTab_Layout_RadioButton_selected {
199-
border-color: $accent-color;
200-
}
201-
}
202-
203-
.mx_RadioButton {
204-
border-top: 1px solid $appearance-tab-border-color;
205-
206-
> input + div {
207-
border-color: rgba($muted-fg-color, 0.2);
208-
}
209-
}
210-
211-
.mx_RadioButton_checked {
212-
background-color: rgba($accent-color, 0.08);
213-
}
214-
215-
.mx_EventTile {
216-
margin: 0;
217-
&[data-layout=bubble] {
218-
margin-right: 40px;
219-
}
220-
&[data-layout=irc] {
221-
> a {
222-
display: none;
223-
}
224-
}
225-
.mx_EventTile_line {
226-
max-width: 90%;
227-
}
228-
}
229-
}
230-
231158
.mx_AppearanceUserSettingsTab_Advanced {
232159
color: $primary-fg-color;
233160

0 commit comments

Comments
 (0)