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

Commit 0004dd4

Browse files
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2 parents 12bc3ea + ca4e720 commit 0004dd4

File tree

88 files changed

+2236
-1300
lines changed

Some content is hidden

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

88 files changed

+2236
-1300
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Changes in [3.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.6.1) (2020-10-20)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.0...v3.6.1)
4+
5+
* [Release] Adjust for new widget messaging APIs
6+
[\#5342](https://github.com/matrix-org/matrix-react-sdk/pull/5342)
7+
* [Release] Fix Jitsi OpenIDC auth
8+
[\#5335](https://github.com/matrix-org/matrix-react-sdk/pull/5335)
9+
110
Changes in [3.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.6.0) (2020-10-12)
211
===================================================================================================
312
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.0-rc.1...v3.6.0)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ are currently filed against vector-im/element-web rather than this project).
1818

1919
Translation Status
2020
==================
21-
[![Translation status](https://translate.riot.im/widgets/element-web/-/multi-auto.svg)](https://translate.riot.im/engage/element-web/?utm_source=widget)
21+
[![Translation status](https://translate.element.io/widgets/element-web/-/multi-auto.svg)](https://translate.element.io/engage/element-web/?utm_source=widget)
2222

2323
Developer Guide
2424
===============

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.6.0",
3+
"version": "3.6.1",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {

release.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ do
3232
echo "Upgrading $i to $latestver..."
3333
yarn add -E $i@$latestver
3434
git add -u
35-
# The `-e` flag opens the editor and gives you a chance to check
36-
# the upgrade for correctness.
37-
git commit -m "Upgrade $i to $latestver" -e
35+
git commit -m "Upgrade $i to $latestver"
3836
fi
3937
fi
4038
done

res/css/_components.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@import "./structures/_HeaderButtons.scss";
1414
@import "./structures/_HomePage.scss";
1515
@import "./structures/_LeftPanel.scss";
16+
@import "./structures/_LeftPanelWidget.scss";
1617
@import "./structures/_MainSplit.scss";
1718
@import "./structures/_MatrixChat.scss";
1819
@import "./structures/_MyGroups.scss";
@@ -51,11 +52,11 @@
5152
@import "./views/avatars/_DecoratedRoomAvatar.scss";
5253
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
5354
@import "./views/avatars/_PulsedAvatar.scss";
55+
@import "./views/avatars/_WidgetAvatar.scss";
5456
@import "./views/context_menus/_IconizedContextMenu.scss";
5557
@import "./views/context_menus/_MessageContextMenu.scss";
5658
@import "./views/context_menus/_StatusMessageContextMenu.scss";
5759
@import "./views/context_menus/_TagTileContextMenu.scss";
58-
@import "./views/context_menus/_WidgetContextMenu.scss";
5960
@import "./views/dialogs/_AddressPickerDialog.scss";
6061
@import "./views/dialogs/_Analytics.scss";
6162
@import "./views/dialogs/_BugReportDialog.scss";
Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
/*
2+
Copyright 2020 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+
17+
.mx_LeftPanelWidget {
18+
// largely based on RoomSublist
19+
margin-left: 8px;
20+
margin-bottom: 4px;
21+
22+
.mx_LeftPanelWidget_headerContainer {
23+
display: flex;
24+
align-items: center;
25+
26+
height: 24px;
27+
color: $roomlist-header-color;
28+
margin-top: 4px;
29+
30+
.mx_LeftPanelWidget_stickable {
31+
flex: 1;
32+
max-width: 100%;
33+
34+
display: flex;
35+
align-items: center;
36+
}
37+
38+
.mx_LeftPanelWidget_headerText {
39+
flex: 1;
40+
max-width: calc(100% - 16px);
41+
line-height: $font-16px;
42+
font-size: $font-13px;
43+
font-weight: 600;
44+
45+
// Ellipsize any text overflow
46+
text-overflow: ellipsis;
47+
overflow: hidden;
48+
white-space: nowrap;
49+
50+
.mx_LeftPanelWidget_collapseBtn {
51+
display: inline-block;
52+
position: relative;
53+
width: 14px;
54+
height: 14px;
55+
margin-right: 6px;
56+
57+
&::before {
58+
content: '';
59+
width: 18px;
60+
height: 18px;
61+
position: absolute;
62+
mask-position: center;
63+
mask-size: contain;
64+
mask-repeat: no-repeat;
65+
background-color: $roomlist-header-color;
66+
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
67+
}
68+
69+
&.mx_LeftPanelWidget_collapseBtn_collapsed::before {
70+
transform: rotate(-90deg);
71+
}
72+
}
73+
}
74+
}
75+
76+
.mx_LeftPanelWidget_resizeBox {
77+
position: relative;
78+
79+
display: flex;
80+
flex-direction: column;
81+
overflow: visible; // let the resize handle out
82+
}
83+
84+
.mx_AppTileFullWidth {
85+
flex: 1 0 0;
86+
overflow: hidden;
87+
// need this to be flex otherwise the overflow hidden from above
88+
// sometimes vertically centers the clipped list ... no idea why it would do this
89+
// as the box model should be top aligned. Happens in both FF and Chromium
90+
display: flex;
91+
flex-direction: column;
92+
box-sizing: border-box;
93+
94+
mask-image: linear-gradient(0deg, transparent, black 4px);
95+
}
96+
97+
.mx_LeftPanelWidget_resizerHandle {
98+
cursor: ns-resize;
99+
border-radius: 3px;
100+
101+
// Override styles from library
102+
width: unset !important;
103+
height: 4px !important;
104+
105+
position: absolute;
106+
top: -24px !important; // override from library - puts it in the margin-top of the headerContainer
107+
108+
// Together, these make the bar 64px wide
109+
// These are also overridden from the library
110+
left: calc(50% - 32px) !important;
111+
right: calc(50% - 32px) !important;
112+
}
113+
114+
&:hover .mx_LeftPanelWidget_resizerHandle {
115+
opacity: 0.8;
116+
background-color: $primary-fg-color;
117+
}
118+
119+
.mx_LeftPanelWidget_maximizeButton {
120+
margin-left: 8px;
121+
margin-right: 7px;
122+
position: relative;
123+
width: 24px;
124+
height: 24px;
125+
border-radius: 32px;
126+
127+
&::before {
128+
content: '';
129+
width: 16px;
130+
height: 16px;
131+
position: absolute;
132+
top: 4px;
133+
left: 4px;
134+
mask-position: center;
135+
mask-size: contain;
136+
mask-repeat: no-repeat;
137+
mask-image: url('$(res)/img/feather-customised/widget/maximise.svg');
138+
background: $muted-fg-color;
139+
}
140+
}
141+
}
142+
143+
.mx_LeftPanelWidget_maximizeButtonTooltip {
144+
margin-top: -3px;
145+
}

res/css/structures/_MatrixChat.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ limitations under the License.
7979
height: 100%;
8080
}
8181

82-
.mx_MatrixChat > .mx_LeftPanel2:hover + .mx_ResizeHandle_horizontal,
8382
.mx_MatrixChat > .mx_ResizeHandle_horizontal:hover {
8483
position: relative;
8584

res/css/structures/_UserMenu.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ limitations under the License.
230230
align-items: center;
231231
justify-content: center;
232232
}
233+
234+
&.mx_UserMenu_contextMenu_hostingLink {
235+
padding-top: 0;
236+
}
233237
}
234238

235239
.mx_IconizedContextMenu_icon {

src/dispatcher/payloads/AppTileActionPayload.ts renamed to res/css/views/avatars/_WidgetAvatar.scss

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

17-
import { ActionPayload } from "../payloads";
18-
import { Action } from "../actions";
19-
20-
export interface AppTileActionPayload extends ActionPayload {
21-
action: Action.AppTileDelete | Action.AppTileRevoke;
22-
widgetId: string;
17+
.mx_WidgetAvatar {
18+
border-radius: 4px;
2319
}

res/css/views/context_menus/_WidgetContextMenu.scss

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

0 commit comments

Comments
 (0)