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

Commit 2a21d45

Browse files
czeidlerczeidler
committed
Merge branch 'develop' into key-bindings
2 parents 0618122 + 7c8c851 commit 2a21d45

File tree

388 files changed

+4298
-1546
lines changed

Some content is hidden

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

388 files changed

+4298
-1546
lines changed

‎babel.config.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ module.exports = {
33
"presets": [
44
["@babel/preset-env", {
55
"targets": [
6-
"last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
6+
"last 2 Chrome versions",
7+
"last 2 Firefox versions",
8+
"last 2 Safari versions",
9+
"last 2 Edge versions",
710
],
811
}],
912
"@babel/preset-typescript",
1013
"@babel/preset-flow",
11-
"@babel/preset-react"
14+
"@babel/preset-react",
1215
],
1316
"plugins": [
1417
["@babel/plugin-proposal-decorators", {legacy: true}],
@@ -18,6 +21,6 @@ module.exports = {
1821
"@babel/plugin-proposal-object-rest-spread",
1922
"@babel/plugin-transform-flow-comments",
2023
"@babel/plugin-syntax-dynamic-import",
21-
"@babel/plugin-transform-runtime"
22-
]
24+
"@babel/plugin-transform-runtime",
25+
],
2326
};

‎res/css/_common.scss‎

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -489,54 +489,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
489489
margin-top: 69px;
490490
}
491491

492-
.mx_Beta {
493-
color: red;
494-
margin-right: 10px;
495-
position: relative;
496-
top: -3px;
497-
background-color: white;
498-
padding: 0 4px;
499-
border-radius: 3px;
500-
border: 1px solid darkred;
501-
cursor: help;
502-
transition-duration: 200ms;
503-
font-size: smaller;
504-
filter: opacity(0.5);
505-
}
506-
507-
.mx_Beta:hover {
508-
color: white;
509-
border: 1px solid gray;
510-
background-color: darkred;
511-
}
512-
513-
.mx_TintableSvgButton {
514-
position: relative;
515-
display: flex;
516-
flex-direction: row;
517-
justify-content: center;
518-
align-content: center;
519-
}
520-
521-
.mx_TintableSvgButton object {
522-
margin: 0;
523-
padding: 0;
524-
width: 100%;
525-
height: 100%;
526-
max-width: 100%;
527-
max-height: 100%;
528-
}
529-
530-
.mx_TintableSvgButton span {
531-
position: absolute;
532-
top: 0;
533-
right: 0;
534-
bottom: 0;
535-
left: 0;
536-
opacity: 0;
537-
cursor: pointer;
538-
}
539-
540492
// username colors
541493
// used by SenderProfile & RoomPreviewBar
542494
.mx_Username_color1 {
@@ -606,6 +558,13 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
606558
}
607559
}
608560

561+
@define-mixin ProgressBarBgColour $colour {
562+
background-color: $colour;
563+
&::-webkit-progress-bar {
564+
background-color: $colour;
565+
}
566+
}
567+
609568
@define-mixin ProgressBarBorderRadius $radius {
610569
border-radius: $radius;
611570
&::-moz-progress-bar {

‎res/css/structures/_MainSplit.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ limitations under the License.
1818
display: flex;
1919
flex-direction: row;
2020
min-width: 0;
21+
min-height: 0;
2122
height: 100%;
2223
}
2324

‎res/css/structures/_RoomView.scss‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,54 @@ limitations under the License.
2020
flex-direction: column;
2121
}
2222

23+
24+
@keyframes mx_RoomView_fileDropTarget_animation {
25+
from {
26+
opacity: 0;
27+
}
28+
to {
29+
opacity: 0.95;
30+
}
31+
}
32+
2333
.mx_RoomView_fileDropTarget {
2434
min-width: 0px;
2535
width: 100%;
36+
height: 100%;
37+
2638
font-size: $font-18px;
2739
text-align: center;
2840

2941
pointer-events: none;
3042

31-
padding-left: 12px;
32-
padding-right: 12px;
33-
margin-left: -12px;
34-
35-
border-top-left-radius: 10px;
36-
border-top-right-radius: 10px;
43+
background-color: $primary-bg-color;
44+
opacity: 0.95;
3745

38-
background-color: $droptarget-bg-color;
39-
border: 2px #e1dddd solid;
40-
border-bottom: none;
4146
position: absolute;
42-
top: 52px;
43-
bottom: 0px;
4447
z-index: 3000;
48+
49+
display: flex;
50+
flex-direction: column;
51+
justify-content: center;
52+
align-items: center;
53+
54+
animation: mx_RoomView_fileDropTarget_animation;
55+
animation-duration: 0.5s;
4556
}
4657

47-
.mx_RoomView_fileDropTargetLabel {
48-
top: 50%;
49-
width: 100%;
50-
margin-top: -50px;
51-
position: absolute;
58+
@keyframes mx_RoomView_fileDropTarget_image_animation {
59+
from {
60+
width: 0px;
61+
}
62+
to {
63+
width: 32px;
64+
}
65+
}
66+
67+
.mx_RoomView_fileDropTarget_image {
68+
animation: mx_RoomView_fileDropTarget_image_animation;
69+
animation-duration: 0.5s;
70+
margin-bottom: 16px;
5271
}
5372

5473
.mx_RoomView_auxPanel {
@@ -117,7 +136,6 @@ limitations under the License.
117136
}
118137

119138
.mx_RoomView_body {
120-
position: relative; //for .mx_RoomView_auxPanel_fullHeight
121139
display: flex;
122140
flex-direction: column;
123141
flex: 1;

‎res/css/structures/_SpaceRoomDirectory.scss‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,9 @@ limitations under the License.
203203
.mx_SpaceRoomDirectory_actions {
204204
width: 180px;
205205
text-align: right;
206-
height: min-content;
207-
margin: auto 0 auto 28px;
206+
margin-left: 28px;
207+
display: inline-flex;
208+
align-items: center;
208209

209210
.mx_AccessibleButton {
210211
vertical-align: middle;
@@ -223,9 +224,5 @@ limitations under the License.
223224
line-height: $font-15px;
224225
color: $secondary-fg-color;
225226
}
226-
227-
.mx_Checkbox {
228-
display: inline-block;
229-
}
230227
}
231228
}

‎res/css/structures/_SpaceRoomView.scss‎

Lines changed: 111 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ $SpaceRoomViewInnerWidth: 428px;
2020
.mx_MainSplit > div:first-child {
2121
padding: 80px 60px;
2222
flex-grow: 1;
23+
max-height: 100%;
24+
overflow-y: auto;
2325

2426
h1 {
2527
margin: 0;
@@ -69,9 +71,116 @@ $SpaceRoomViewInnerWidth: 428px;
6971
}
7072
}
7173

72-
.mx_SpaceRoomView_landing {
73-
overflow-y: auto;
74+
.mx_SpaceRoomView_preview {
75+
padding: 32px 24px !important; // override default padding from above
76+
margin: auto;
77+
max-width: 480px;
78+
box-sizing: border-box;
79+
box-shadow: 2px 15px 30px $dialog-shadow-color;
80+
border: 1px solid $input-border-color;
81+
border-radius: 8px;
82+
83+
.mx_SpaceRoomView_preview_inviter {
84+
display: flex;
85+
align-items: center;
86+
margin-bottom: 20px;
87+
font-size: $font-15px;
88+
89+
> div {
90+
margin-left: 8px;
91+
92+
.mx_SpaceRoomView_preview_inviter_name {
93+
line-height: $font-18px;
94+
}
95+
96+
.mx_SpaceRoomView_preview_inviter_mxid {
97+
line-height: $font-24px;
98+
color: $secondary-fg-color;
99+
}
100+
}
101+
}
102+
103+
> .mx_BaseAvatar_image,
104+
> .mx_BaseAvatar > .mx_BaseAvatar_image {
105+
border-radius: 12px;
106+
}
107+
108+
h1.mx_SpaceRoomView_preview_name {
109+
margin: 20px 0 !important; // override default margin from above
110+
}
111+
112+
.mx_SpaceRoomView_preview_info {
113+
color: $tertiary-fg-color;
114+
font-size: $font-15px;
115+
line-height: $font-24px;
116+
margin: 20px 0;
117+
118+
.mx_SpaceRoomView_preview_info_public,
119+
.mx_SpaceRoomView_preview_info_private {
120+
padding-left: 20px;
121+
position: relative;
122+
123+
&::before {
124+
position: absolute;
125+
content: "";
126+
width: 20px;
127+
height: 20px;
128+
top: 0;
129+
left: -2px;
130+
mask-position: center;
131+
mask-repeat: no-repeat;
132+
background-color: $tertiary-fg-color;
133+
}
134+
}
135+
136+
.mx_SpaceRoomView_preview_info_public::before {
137+
mask-size: 12px;
138+
mask-image: url("$(res)/img/globe.svg");
139+
}
140+
141+
.mx_SpaceRoomView_preview_info_private::before {
142+
mask-size: 14px;
143+
mask-image: url("$(res)/img/element-icons/lock.svg");
144+
}
145+
146+
.mx_AccessibleButton_kind_link {
147+
color: inherit;
148+
position: relative;
149+
padding-left: 16px;
150+
151+
&::before {
152+
content: "·"; // visual separator
153+
position: absolute;
154+
left: 6px;
155+
}
156+
}
157+
}
158+
159+
.mx_SpaceRoomView_preview_topic {
160+
font-size: $font-14px;
161+
line-height: $font-22px;
162+
color: $secondary-fg-color;
163+
margin: 20px 0;
164+
max-height: 160px;
165+
overflow-y: auto;
166+
}
167+
168+
.mx_SpaceRoomView_preview_joinButtons {
169+
margin-top: 20px;
74170

171+
.mx_AccessibleButton {
172+
width: 200px;
173+
box-sizing: border-box;
174+
padding: 14px 0;
175+
176+
& + .mx_AccessibleButton {
177+
margin-left: 20px;
178+
}
179+
}
180+
}
181+
}
182+
183+
.mx_SpaceRoomView_landing {
75184
> .mx_BaseAvatar_image,
76185
> .mx_BaseAvatar > .mx_BaseAvatar_image {
77186
border-radius: 12px;
@@ -128,14 +237,6 @@ $SpaceRoomViewInnerWidth: 428px;
128237
font-size: $font-15px;
129238
}
130239

131-
.mx_SpaceRoomView_landing_joinButtons {
132-
margin-top: 24px;
133-
134-
.mx_FormButton {
135-
padding: 8px 22px;
136-
}
137-
}
138-
139240
.mx_SpaceRoomView_landing_adminButtons {
140241
margin-top: 32px;
141242

0 commit comments

Comments
 (0)