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

Commit 9cb3c71

Browse files
novocainenovocaine
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2 parents 685b592 + 6809817 commit 9cb3c71

File tree

164 files changed

+3541
-1160
lines changed

Some content is hidden

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

164 files changed

+3541
-1160
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1-
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst before submitting your pull request -->
1+
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
22

3-
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst#sign-off -->
3+
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
4+
5+
<!-- To specify text for the changelog entry (otherwise the PR title will be used):
6+
Notes:
7+
8+
Changes in this project generate changelog entries in element-web by default.
9+
To suppress this:
10+
11+
element-web notes: none
12+
13+
...or to specify different notes:
14+
element-web notes: <notes>
15+
-->

‎.github/workflows/develop.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Develop
22
on:
3+
# These tests won't work for non-develop branches at the moment as they
4+
# won't pull in the right versions of other repos, so they're only enabled
5+
# on develop.
36
push:
47
branches: [develop]
58
pull_request:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ package-lock.json
1515

1616
.DS_Store
1717
*.tmp
18+
19+
.vscode
20+
.vscode/

‎CONTRIBUTING.rst‎ renamed to ‎CONTRIBUTING.md‎

File renamed without changes.

‎__mocks__/FontManager.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Stub out FontManager for tests as it doesn't validate anything we don't already know given
2+
// our fixed test environment and it requires the installation of node-canvas.
3+
4+
module.exports = {
5+
fixupColorFonts: () => Promise.resolve(),
6+
};

‎__mocks__/workerMock.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = jest.fn();

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
"@types/classnames": "^2.2.11",
127127
"@types/commonmark": "^0.27.4",
128128
"@types/counterpart": "^0.18.1",
129+
"@types/css-font-loading-module": "^0.0.6",
129130
"@types/diff-match-patch": "^1.0.32",
130131
"@types/flux": "^3.1.9",
131132
"@types/jest": "^26.0.20",
@@ -186,7 +187,8 @@
186187
"\\$webapp/i18n/languages.json": "<rootDir>/__mocks__/languages.json",
187188
"decoderWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
188189
"decoderWorker\\.min\\.wasm": "<rootDir>/__mocks__/empty.js",
189-
"waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js"
190+
"waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
191+
"workers/(.+)\\.worker\\.ts": "<rootDir>/__mocks__/workerMock.js"
190192
},
191193
"transformIgnorePatterns": [
192194
"/node_modules/(?!matrix-js-sdk).+$"

‎res/css/_components.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
@import "./views/elements/_AddressTile.scss";
121121
@import "./views/elements/_DesktopBuildsNotice.scss";
122122
@import "./views/elements/_DesktopCapturerSourcePicker.scss";
123+
@import "./views/elements/_DialPadBackspaceButton.scss";
123124
@import "./views/elements/_DirectorySearchBox.scss";
124125
@import "./views/elements/_Dropdown.scss";
125126
@import "./views/elements/_EditableItemList.scss";
@@ -163,6 +164,7 @@
163164
@import "./views/messages/_MEmoteBody.scss";
164165
@import "./views/messages/_MFileBody.scss";
165166
@import "./views/messages/_MImageBody.scss";
167+
@import "./views/messages/_MImageReplyBody.scss";
166168
@import "./views/messages/_MJitsiWidgetEvent.scss";
167169
@import "./views/messages/_MNoticeBody.scss";
168170
@import "./views/messages/_MStickerBody.scss";
@@ -212,6 +214,7 @@
212214
@import "./views/rooms/_PinnedEventTile.scss";
213215
@import "./views/rooms/_PresenceLabel.scss";
214216
@import "./views/rooms/_ReplyPreview.scss";
217+
@import "./views/rooms/_ReplyTile.scss";
215218
@import "./views/rooms/_RoomBreadcrumbs.scss";
216219
@import "./views/rooms/_RoomHeader.scss";
217220
@import "./views/rooms/_RoomList.scss";

‎res/css/structures/_TabbedView.scss‎

Lines changed: 87 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
Copyright 2017 Travis Ralston
33
Copyright 2019 New Vector Ltd
4+
Copyright 2021 The Matrix.org Foundation C.I.C.
45
56
Licensed under the Apache License, Version 2.0 (the "License");
67
you may not use this file except in compliance with the License.
@@ -20,19 +21,100 @@ limitations under the License.
2021
padding: 0 0 0 16px;
2122
display: flex;
2223
flex-direction: column;
23-
position: absolute;
2424
top: 0;
2525
bottom: 0;
2626
left: 0;
2727
right: 0;
2828
margin-top: 8px;
2929
}
3030

31+
.mx_TabbedView_tabsOnLeft {
32+
flex-direction: column;
33+
position: absolute;
34+
35+
.mx_TabbedView_tabLabels {
36+
width: 170px;
37+
max-width: 170px;
38+
position: fixed;
39+
}
40+
41+
.mx_TabbedView_tabPanel {
42+
margin-left: 240px; // 170px sidebar + 70px padding
43+
flex-direction: column;
44+
}
45+
46+
.mx_TabbedView_tabLabel_active {
47+
background-color: $tab-label-active-bg-color;
48+
color: $tab-label-active-fg-color;
49+
}
50+
51+
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
52+
background-color: $tab-label-active-icon-bg-color;
53+
}
54+
55+
.mx_TabbedView_maskedIcon {
56+
width: 16px;
57+
height: 16px;
58+
margin-left: 8px;
59+
margin-right: 16px;
60+
}
61+
62+
.mx_TabbedView_maskedIcon::before {
63+
mask-size: 16px;
64+
width: 16px;
65+
height: 16px;
66+
}
67+
}
68+
69+
.mx_TabbedView_tabsOnTop {
70+
flex-direction: column;
71+
72+
.mx_TabbedView_tabLabels {
73+
display: flex;
74+
margin-bottom: 8px;
75+
}
76+
77+
.mx_TabbedView_tabLabel {
78+
padding-left: 0px;
79+
padding-right: 52px;
80+
81+
.mx_TabbedView_tabLabel_text {
82+
font-size: 15px;
83+
color: $tertiary-fg-color;
84+
}
85+
}
86+
87+
.mx_TabbedView_tabPanel {
88+
flex-direction: row;
89+
}
90+
91+
.mx_TabbedView_tabLabel_active {
92+
color: $accent-color;
93+
.mx_TabbedView_tabLabel_text {
94+
color: $accent-color;
95+
}
96+
}
97+
98+
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
99+
background-color: $accent-color;
100+
}
101+
102+
.mx_TabbedView_maskedIcon {
103+
width: 22px;
104+
height: 22px;
105+
margin-left: 0px;
106+
margin-right: 8px;
107+
}
108+
109+
.mx_TabbedView_maskedIcon::before {
110+
mask-size: 22px;
111+
width: inherit;
112+
height: inherit;
113+
}
114+
}
115+
31116
.mx_TabbedView_tabLabels {
32-
width: 170px;
33-
max-width: 170px;
34117
color: $tab-label-fg-color;
35-
position: fixed;
36118
}
37119

38120
.mx_TabbedView_tabLabel {
@@ -46,43 +128,25 @@ limitations under the License.
46128
position: relative;
47129
}
48130

49-
.mx_TabbedView_tabLabel_active {
50-
background-color: $tab-label-active-bg-color;
51-
color: $tab-label-active-fg-color;
52-
}
53-
54131
.mx_TabbedView_maskedIcon {
55-
margin-left: 8px;
56-
margin-right: 16px;
57-
width: 16px;
58-
height: 16px;
59132
display: inline-block;
60133
}
61134

62135
.mx_TabbedView_maskedIcon::before {
63136
display: inline-block;
64-
background-color: $tab-label-icon-bg-color;
137+
background-color: $icon-button-color;
65138
mask-repeat: no-repeat;
66-
mask-size: 16px;
67-
width: 16px;
68-
height: 16px;
69139
mask-position: center;
70140
content: '';
71141
}
72142

73-
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
74-
background-color: $tab-label-active-icon-bg-color;
75-
}
76-
77143
.mx_TabbedView_tabLabel_text {
78144
vertical-align: middle;
79145
}
80146

81147
.mx_TabbedView_tabPanel {
82-
margin-left: 240px; // 170px sidebar + 70px padding
83148
flex-grow: 1;
84149
display: flex;
85-
flex-direction: column;
86150
min-height: 0; // firefox
87151
}
88152

‎res/css/views/audio_messages/_PlaybackContainer.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,8 @@ limitations under the License.
4949
padding-right: 6px; // with the fixed width this ends up as a visual 8px most of the time, as intended.
5050
padding-left: 8px; // isolate from recording circle / play control
5151
}
52+
53+
&.mx_VoiceMessagePrimaryContainer_noWaveform {
54+
max-width: 162px; // with all the padding this results in 185px wide
55+
}
5256
}

0 commit comments

Comments
 (0)