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

Commit 228d623

Browse files
authored
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2 parents c6085a1 + 9d3569a commit 228d623

File tree

22 files changed

+988
-83
lines changed

22 files changed

+988
-83
lines changed

res/css/_components.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
@import "./views/dialogs/_CreateCommunityPrototypeDialog.scss";
7676
@import "./views/dialogs/_CreateGroupDialog.scss";
7777
@import "./views/dialogs/_CreateRoomDialog.scss";
78+
@import "./views/dialogs/_CreateSpaceFromCommunityDialog.scss";
7879
@import "./views/dialogs/_CreateSubspaceDialog.scss";
7980
@import "./views/dialogs/_DeactivateAccountDialog.scss";
8081
@import "./views/dialogs/_DevtoolsDialog.scss";

res/css/structures/_GroupView.scss

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,65 @@ limitations under the License.
368368
padding: 40px 20px;
369369
}
370370

371+
.mx_GroupView_spaceUpgradePrompt {
372+
padding: 16px 50px;
373+
background-color: $header-panel-bg-color;
374+
border-radius: 8px;
375+
max-width: 632px;
376+
font-size: $font-15px;
377+
line-height: $font-24px;
378+
margin-top: 24px;
379+
position: relative;
380+
381+
> h2 {
382+
font-size: inherit;
383+
font-weight: $font-semi-bold;
384+
}
385+
386+
> p, h2 {
387+
margin: 0;
388+
}
389+
390+
&::before {
391+
content: "";
392+
position: absolute;
393+
height: $font-24px;
394+
width: 20px;
395+
left: 18px;
396+
mask-repeat: no-repeat;
397+
mask-position: center;
398+
mask-size: contain;
399+
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
400+
background-color: $secondary-fg-color;
401+
}
402+
403+
.mx_AccessibleButton_kind_link {
404+
padding: 0;
405+
}
406+
407+
.mx_GroupView_spaceUpgradePrompt_close {
408+
width: 16px;
409+
height: 16px;
410+
border-radius: 8px;
411+
background-color: $input-darker-bg-color;
412+
position: absolute;
413+
top: 16px;
414+
right: 16px;
415+
416+
&::before {
417+
content: "";
418+
position: absolute;
419+
width: inherit;
420+
height: inherit;
421+
mask-repeat: no-repeat;
422+
mask-position: center;
423+
mask-size: 8px;
424+
mask-image: url('$(res)/img/image-view/close.svg');
425+
background-color: $secondary-fg-color;
426+
}
427+
}
428+
}
429+
371430
.mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar > :not(.mx_MemberInfo_avatar) {
372431
padding-left: 16px;
373432
padding-right: 16px;

res/css/structures/_SpaceRoomView.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,18 @@ $SpaceRoomViewInnerWidth: 428px;
180180
}
181181
}
182182

183+
.mx_SpaceRoomView_preview_migratedCommunity {
184+
margin-bottom: 16px;
185+
padding: 8px 12px;
186+
border-radius: 8px;
187+
border: 1px solid $input-border-color;
188+
width: max-content;
189+
190+
.mx_BaseAvatar {
191+
margin-right: 4px;
192+
}
193+
}
194+
183195
.mx_SpaceRoomView_preview_inviter {
184196
display: flex;
185197
align-items: center;
@@ -342,7 +354,7 @@ $SpaceRoomViewInnerWidth: 428px;
342354

343355
.mx_SpaceFeedbackPrompt {
344356
padding: 7px; // 8px - 1px border
345-
border: 1px solid $menu-border-color;
357+
border: 1px solid rgba($primary-fg-color, .1);
346358
border-radius: 8px;
347359
width: max-content;
348360
margin: 0 0 -40px auto; // collapse its own height to not push other components down

res/css/views/context_menus/_TagTileContextMenu.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ limitations under the License.
5151
mask-image: url('$(res)/img/element-icons/hide.svg');
5252
}
5353

54+
.mx_TagTileContextMenu_createSpace::before {
55+
mask-image: url('$(res)/img/element-icons/message/fwd.svg');
56+
}
57+
5458
.mx_TagTileContextMenu_separator {
5559
margin-top: 0;
5660
margin-bottom: 0;
Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
/*
2+
Copyright 2021 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_CreateSpaceFromCommunityDialog_wrapper {
18+
.mx_Dialog {
19+
display: flex;
20+
flex-direction: column;
21+
}
22+
}
23+
24+
.mx_CreateSpaceFromCommunityDialog {
25+
width: 480px;
26+
color: $primary-fg-color;
27+
display: flex;
28+
flex-direction: column;
29+
flex-wrap: nowrap;
30+
min-height: 0;
31+
32+
.mx_CreateSpaceFromCommunityDialog_content {
33+
> p {
34+
font-size: $font-15px;
35+
line-height: $font-24px;
36+
37+
&:first-of-type {
38+
margin-top: 0;
39+
}
40+
41+
&.mx_CreateSpaceFromCommunityDialog_flairNotice {
42+
font-size: $font-12px;
43+
line-height: $font-15px;
44+
}
45+
}
46+
47+
.mx_SpaceBasicSettings {
48+
> p {
49+
font-size: $font-12px;
50+
line-height: $font-15px;
51+
margin: 16px 0;
52+
}
53+
54+
.mx_Field_textarea {
55+
margin-bottom: 0;
56+
}
57+
}
58+
59+
.mx_JoinRuleDropdown .mx_Dropdown_menu {
60+
width: auto !important; // override fixed width
61+
}
62+
63+
.mx_CreateSpaceFromCommunityDialog_nonPublicSpacer {
64+
height: 63px; // balance the height of the missing room alias field to prevent modal bouncing
65+
}
66+
}
67+
68+
.mx_CreateSpaceFromCommunityDialog_footer {
69+
display: flex;
70+
margin-top: 20px;
71+
72+
> span {
73+
flex-grow: 1;
74+
font-size: $font-12px;
75+
line-height: $font-15px;
76+
color: $secondary-fg-color;
77+
78+
.mx_ProgressBar {
79+
height: 8px;
80+
width: 100%;
81+
82+
@mixin ProgressBarBorderRadius 8px;
83+
}
84+
85+
.mx_CreateSpaceFromCommunityDialog_progressText {
86+
margin-top: 8px;
87+
font-size: $font-15px;
88+
line-height: $font-24px;
89+
color: $primary-fg-color;
90+
}
91+
92+
> * {
93+
vertical-align: middle;
94+
}
95+
}
96+
97+
.mx_CreateSpaceFromCommunityDialog_error {
98+
padding-left: 12px;
99+
100+
> img {
101+
align-self: center;
102+
}
103+
104+
.mx_CreateSpaceFromCommunityDialog_errorHeading {
105+
font-weight: $font-semi-bold;
106+
font-size: $font-15px;
107+
line-height: $font-18px;
108+
color: $notice-primary-color;
109+
}
110+
111+
.mx_CreateSpaceFromCommunityDialog_errorCaption {
112+
margin-top: 4px;
113+
font-size: $font-12px;
114+
line-height: $font-15px;
115+
color: $primary-fg-color;
116+
}
117+
}
118+
119+
.mx_AccessibleButton {
120+
display: inline-block;
121+
align-self: center;
122+
}
123+
124+
.mx_AccessibleButton_kind_primary {
125+
padding: 8px 36px;
126+
margin-left: 24px;
127+
}
128+
129+
.mx_AccessibleButton_kind_primary_outline {
130+
margin-left: auto;
131+
}
132+
133+
.mx_CreateSpaceFromCommunityDialog_retryButton {
134+
margin-left: 12px;
135+
padding-left: 24px;
136+
position: relative;
137+
138+
&::before {
139+
content: '';
140+
position: absolute;
141+
background-color: $primary-fg-color;
142+
mask-repeat: no-repeat;
143+
mask-position: center;
144+
mask-size: contain;
145+
mask-image: url('$(res)/img/element-icons/retry.svg');
146+
width: 18px;
147+
height: 18px;
148+
left: 0;
149+
}
150+
}
151+
152+
.mx_AccessibleButton_kind_link {
153+
padding: 0;
154+
}
155+
}
156+
}
157+
158+
.mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog {
159+
.mx_InfoDialog {
160+
max-width: 500px;
161+
}
162+
163+
.mx_AccessibleButton_kind_link {
164+
padding: 0;
165+
}
166+
167+
.mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark {
168+
position: relative;
169+
border-radius: 50%;
170+
border: 3px solid $accent-color;
171+
width: 68px;
172+
height: 68px;
173+
margin: 12px auto 32px;
174+
175+
&::before {
176+
width: inherit;
177+
height: inherit;
178+
content: '';
179+
position: absolute;
180+
background-color: $accent-color;
181+
mask-repeat: no-repeat;
182+
mask-position: center;
183+
mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
184+
mask-size: 48px;
185+
}
186+
}
187+
}

res/css/views/elements/_Field.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ limitations under the License.
3838
.mx_Field input,
3939
.mx_Field select,
4040
.mx_Field textarea {
41+
font-family: inherit;
4142
font-weight: normal;
4243
font-size: $font-14px;
4344
border: none;

res/css/views/settings/tabs/_SettingsTab.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,21 @@ limitations under the License.
5050
}
5151

5252
.mx_SettingsTab_section {
53+
$right-gutter: 80px;
54+
5355
margin-bottom: 24px;
5456

5557
.mx_SettingsFlag {
56-
margin-right: 80px;
58+
margin-right: $right-gutter;
5759
margin-bottom: 10px;
5860
}
5961

62+
> p {
63+
margin-right: $right-gutter;
64+
}
65+
6066
&.mx_SettingsTab_subsectionText .mx_SettingsFlag {
61-
margin-right: 0px !important;
67+
margin-right: 0 !important;
6268
}
6369
}
6470

res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,25 @@ limitations under the License.
2222
.mx_SettingsTab_section {
2323
margin-bottom: 30px;
2424
}
25+
26+
.mx_PreferencesUserSettingsTab_CommunityMigrator {
27+
margin-right: 200px;
28+
29+
> div {
30+
font-weight: $font-semi-bold;
31+
font-size: $font-15px;
32+
line-height: $font-18px;
33+
color: $primary-fg-color;
34+
margin: 16px 0;
35+
36+
.mx_BaseAvatar {
37+
margin-right: 12px;
38+
vertical-align: middle;
39+
}
40+
41+
.mx_AccessibleButton {
42+
float: right;
43+
}
44+
}
45+
}
2546
}

res/css/views/spaces/_SpaceCreateMenu.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ $spacePanelWidth: 71px;
4141
> p {
4242
font-size: $font-15px;
4343
color: $secondary-fg-color;
44-
margin: 0;
4544
}
4645

4746
.mx_SpaceFeedbackPrompt {
@@ -51,13 +50,6 @@ $spacePanelWidth: 71px;
5150
}
5251
}
5352

54-
// XXX remove this when spaces leaves Beta
55-
.mx_BetaCard_betaPill {
56-
position: absolute;
57-
top: 24px;
58-
right: 24px;
59-
}
60-
6153
.mx_SpaceCreateMenuType {
6254
@mixin SpacePillButton;
6355
}
@@ -100,6 +92,11 @@ $spacePanelWidth: 71px;
10092
width: min-content;
10193
}
10294

95+
.mx_AccessibleButton_kind_link {
96+
padding: 0;
97+
font-size: inherit;
98+
}
99+
103100
.mx_AccessibleButton_disabled {
104101
cursor: not-allowed;
105102
}

0 commit comments

Comments
 (0)