matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Merge remote-tracking branch 'upstream/develop' into task/colors-4

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-10-15 15:23:32 +02:00
parent aeb74471a2 9c753765d5
commit 71eeb836d9
133 changed files with 4235 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/css/structures/_BackdropPanel.scss
View File

@@ -34,4 +34,5 @@ limitations under the License.
z-index: 0;
pointer-events: none;
overflow: hidden;
user-select: none;
}

4
res/css/structures/_RightPanel.scss
View File

@@ -79,6 +79,10 @@ limitations under the License.
}
}
.mx_RightPanel_threadsButton::before {
mask-image: url('$(res)/img/element-icons/room/thread.svg');
}
.mx_RightPanel_notifsButton::before {
mask-image: url('$(res)/img/element-icons/notifications.svg');
mask-position: center;

11
res/css/structures/_SpaceRoomView.scss
View File

@@ -422,7 +422,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_inviteTeammates {
// XXX remove this when spaces leaves Beta
.mx_SpaceRoomView_inviteTeammates_betaDisclaimer {
padding: 58px 16px 16px;
padding: 16px;
position: relative;
border-radius: 8px;
background-color: $header-panel-bg-color;
@@ -465,8 +465,13 @@ $SpaceRoomViewInnerWidth: 428px;
}
}
.mx_SpaceRoomView_inviteTeammates_inviteDialogButton::before {
mask-image: url('$(res)/img/element-icons/room/invite.svg');
.mx_SpaceRoomView_inviteTeammates_inviteDialogButton {
color: $accent-color;
&::before {
mask-image: url('$(res)/img/element-icons/room/invite.svg');
background-color: $accent-color;
}
}
}
}

13
res/css/structures/auth/_CompleteSecurity.scss
View File

@@ -33,6 +33,19 @@ limitations under the License.
margin: 0 auto;
}
.mx_CompleteSecurity_skip {
mask: url('$(res)/img/feather-customised/cancel.svg');
mask-repeat: no-repeat;
mask-position: center;
mask-size: cover;
width: 18px;
height: 18px;
background-color: $dialog-close-fg-color;
cursor: pointer;
position: absolute;
right: 24px;
}
.mx_CompleteSecurity_body {
font-size: $font-15px;
}

24
res/css/structures/auth/_SetupEncryptionBody.scss Normal file
View File

@@ -0,0 +1,24 @@
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_SetupEncryptionBody_reset {
color: $light-fg-color;
margin-top: $font-14px;
a.mx_SetupEncryptionBody_reset_link:is(:link, :hover, :visited) {
color: $warning-color;
}
}