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

Commit 89e3730

Browse files
PalidPalid
committed
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
* develop: (125 commits) delint Doc some values Remove useless image reference Revert accidental renaming of dispatcherRef Fix event highlighthing Move some code around for clarity Constrain emoji skins type even further Delint i18n irc and fix lint from merge conflict Remove unwanted coma in EventTile fix three lints lint fix not sure how these happened :/ remove unused prop Update eslint-plugin-matrix-org Make emoji skins type more specific Rename some variables since their purpose has changed Conform to new react and typescript eslint rules Apply code review suggestions Remove hover effect from files in the files panel ...
2 parents 6f414a2 + 7ea17ae commit 89e3730

File tree

313 files changed

+4280
-2901
lines changed

Some content is hidden

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

313 files changed

+4280
-2901
lines changed

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
4747
"lint": "yarn lint:types && yarn lint:js && yarn lint:style",
4848
"lint:js": "eslint --max-warnings 0 src test",
49+
"lint:js-fix": "eslint --fix src test",
4950
"lint:types": "tsc --noEmit --jsx react",
5051
"lint:style": "stylelint 'res/css/**/*.scss'",
5152
"test": "jest",
@@ -64,8 +65,8 @@
6465
"counterpart": "^0.18.6",
6566
"diff-dom": "^4.2.2",
6667
"diff-match-patch": "^1.0.5",
67-
"emojibase-data": "^5.1.1",
68-
"emojibase-regex": "^4.1.1",
68+
"emojibase-data": "^6.2.0",
69+
"emojibase-regex": "^5.1.3",
6970
"escape-html": "^1.0.3",
7071
"file-saver": "^2.0.5",
7172
"filesize": "6.1.0",

‎res/css/_components.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
@import "./views/messages/_CreateEvent.scss";
163163
@import "./views/messages/_DateSeparator.scss";
164164
@import "./views/messages/_EventTileBubble.scss";
165+
@import "./views/messages/_CallEvent.scss";
165166
@import "./views/messages/_MEmoteBody.scss";
166167
@import "./views/messages/_MFileBody.scss";
167168
@import "./views/messages/_MImageBody.scss";
@@ -201,6 +202,7 @@
201202
@import "./views/rooms/_EditMessageComposer.scss";
202203
@import "./views/rooms/_EntityTile.scss";
203204
@import "./views/rooms/_EventTile.scss";
205+
@import "./views/rooms/_EventBubbleTile.scss";
204206
@import "./views/rooms/_GroupLayout.scss";
205207
@import "./views/rooms/_IRCLayout.scss";
206208
@import "./views/rooms/_JumpToBottomButton.scss";

‎res/css/structures/_FilePanel.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ limitations under the License.
118118
padding-left: 0px;
119119
}
120120

121-
.mx_FilePanel .mx_EventTile:hover .mx_EventTile_line {
122-
background-color: $primary-bg-color;
123-
}
124-
125121
.mx_FilePanel_empty::before {
126122
mask-image: url('$(res)/img/element-icons/room/files.svg');
127123
}

‎res/css/views/avatars/_BaseAvatar.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limitations under the License.
2727
// https://bugzilla.mozilla.org/show_bug.cgi?id=255139
2828
display: inline-block;
2929
user-select: none;
30+
line-height: 1;
3031
}
3132

3233
.mx_BaseAvatar_initial {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,12 @@ limitations under the License.
3030
mask-position: center;
3131
content: '';
3232
vertical-align: middle;
33+
}
34+
35+
.mx_InfoTooltip_icon_info::before {
3336
mask-image: url('$(res)/img/element-icons/info.svg');
3437
}
38+
39+
.mx_InfoTooltip_icon_warning::before {
40+
mask-image: url('$(res)/img/element-icons/warning.svg');
41+
}

‎res/css/views/messages/_CallEvent.scss

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
/*
2+
Copyright 2021 Šimon Brandner <[email protected]>
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+
17+
.mx_CallEvent {
18+
display: flex;
19+
flex-direction: row;
20+
align-items: center;
21+
justify-content: space-between;
22+
23+
background-color: $dark-panel-bg-color;
24+
border-radius: 8px;
25+
margin: 10px auto;
26+
max-width: 75%;
27+
box-sizing: border-box;
28+
height: 60px;
29+
30+
&.mx_CallEvent_voice {
31+
.mx_CallEvent_type_icon::before,
32+
.mx_CallEvent_content_button_callBack span::before,
33+
.mx_CallEvent_content_button_answer span::before {
34+
mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
35+
}
36+
}
37+
38+
&.mx_CallEvent_video {
39+
.mx_CallEvent_type_icon::before,
40+
.mx_CallEvent_content_button_callBack span::before,
41+
.mx_CallEvent_content_button_answer span::before {
42+
mask-image: url('$(res)/img/element-icons/call/video-call.svg');
43+
}
44+
}
45+
46+
.mx_CallEvent_info {
47+
display: flex;
48+
flex-direction: row;
49+
align-items: center;
50+
margin-left: 12px;
51+
52+
.mx_CallEvent_info_basic {
53+
display: flex;
54+
flex-direction: column;
55+
margin-left: 10px; // To match mx_CallEvent
56+
57+
.mx_CallEvent_sender {
58+
font-weight: 600;
59+
font-size: 1.5rem;
60+
line-height: 1.8rem;
61+
margin-bottom: 3px;
62+
}
63+
64+
.mx_CallEvent_type {
65+
font-weight: 400;
66+
color: $secondary-fg-color;
67+
font-size: 1.2rem;
68+
line-height: $font-13px;
69+
display: flex;
70+
align-items: center;
71+
72+
.mx_CallEvent_type_icon {
73+
height: 13px;
74+
width: 13px;
75+
margin-right: 5px;
76+
77+
&::before {
78+
content: '';
79+
position: absolute;
80+
height: 13px;
81+
width: 13px;
82+
background-color: $tertiary-fg-color;
83+
mask-repeat: no-repeat;
84+
mask-size: contain;
85+
}
86+
}
87+
}
88+
}
89+
}
90+
91+
.mx_CallEvent_content {
92+
display: flex;
93+
flex-direction: row;
94+
align-items: center;
95+
color: $secondary-fg-color;
96+
margin-right: 16px;
97+
98+
.mx_CallEvent_content_button {
99+
height: 24px;
100+
padding: 0px 12px;
101+
margin-left: 8px;
102+
103+
span {
104+
padding: 8px 0;
105+
display: flex;
106+
align-items: center;
107+
108+
&::before {
109+
content: '';
110+
display: inline-block;
111+
background-color: $button-fg-color;
112+
mask-position: center;
113+
mask-repeat: no-repeat;
114+
mask-size: 16px;
115+
width: 16px;
116+
height: 16px;
117+
margin-right: 8px;
118+
}
119+
}
120+
}
121+
122+
.mx_CallEvent_content_button_reject span::before {
123+
mask-image: url('$(res)/img/element-icons/call/hangup.svg');
124+
}
125+
126+
.mx_CallEvent_content_tooltip {
127+
margin-right: 5px;
128+
}
129+
130+
.mx_CallEvent_iconButton {
131+
display: inline-flex;
132+
margin-right: 8px;
133+
134+
&::before {
135+
content: '';
136+
137+
height: 16px;
138+
width: 16px;
139+
background-color: $tertiary-fg-color;
140+
mask-repeat: no-repeat;
141+
mask-size: contain;
142+
mask-position: center;
143+
}
144+
}
145+
146+
.mx_CallEvent_silence::before {
147+
mask-image: url('$(res)/img/voip/silence.svg');
148+
}
149+
150+
.mx_CallEvent_unSilence::before {
151+
mask-image: url('$(res)/img/voip/un-silence.svg');
152+
}
153+
}
154+
}

‎res/css/views/messages/_MImageBody.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ $timelineImageBorderRadius: 4px;
1818

1919
.mx_MImageBody {
2020
display: block;
21-
margin-right: 34px;
2221
}
2322

2423
.mx_MImageBody_thumbnail {

‎res/css/views/messages/_MessageActionBar.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,12 @@ limitations under the License.
107107
.mx_MessageActionBar_cancelButton::after {
108108
mask-image: url('$(res)/img/element-icons/trashcan.svg');
109109
}
110+
111+
.mx_MessageActionBar_downloadButton::after {
112+
mask-size: 14px;
113+
mask-image: url('$(res)/img/download.svg');
114+
}
115+
116+
.mx_MessageActionBar_downloadButton.mx_MessageActionBar_downloadSpinnerButton::after {
117+
background-color: transparent; // hide the download icon mask
118+
}

‎res/css/views/messages/_ReactionsRow.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ limitations under the License.
2626
height: 24px;
2727
vertical-align: middle;
2828
margin-left: 4px;
29+
margin-right: 4px;
2930

3031
&::before {
3132
content: '';

0 commit comments

Comments
 (0)