Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/dedup-icons

This commit is contained in:
Michael Telatynski
2024-07-22 13:52:26 +01:00
47 changed files with 267 additions and 398 deletions
-4
View File
@@ -102,7 +102,3 @@ limitations under the License.
padding-inline-start: 0;
}
}
.mx_FilePanel_empty::before {
--maskImage: url("$(res)/img/element-icons/room/files.svg"); /* See: _RightPanel.pcss */
}
@@ -1,19 +0,0 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
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_NotificationPanel_empty::before {
--maskImage: url("$(res)/img/element-icons/notifications.svg"); /* See: _RightPanel.pcss */
}
-27
View File
@@ -72,30 +72,3 @@ limitations under the License.
order: 2;
margin: auto;
}
.mx_RightPanel_empty {
margin-right: -28px;
h2 {
font-weight: 700;
margin: 16px 0;
}
h2,
p {
font: var(--cpd-font-body-md-regular);
}
&::before {
content: "";
display: block;
margin: 11px auto 29px auto;
height: 42px;
width: 42px;
background-color: $header-panel-text-primary-color;
mask-image: var(--maskImage);
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
}
}