Merge branch 't3chguy/dedup-icons-generic' of github.com:element-hq/matrix-react-sdk into t3chguy/dedup-icons

# Conflicts:
#	res/css/views/dialogs/_SpotlightDialog.pcss
#	res/css/views/rooms/_ReplyPreview.pcss
#	res/css/views/rooms/_TopUnreadMessagesBar.pcss
#	res/css/views/user-onboarding/_UserOnboardingButton.pcss
#	res/css/views/user-onboarding/_UserOnboardingTask.pcss
#	src/components/views/elements/AppTile.tsx
#	src/components/views/elements/Tag.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/rooms/LinkPreviewGroup.tsx
#	src/components/views/spaces/QuickSettingsButton.tsx
This commit is contained in:
Michael Telatynski
2024-10-14 16:04:41 +01:00
32 changed files with 318 additions and 87 deletions
@@ -8,5 +8,6 @@ Please see LICENSE files in the repository root for full details.
.mx_KebabContextMenu_icon {
width: 24px;
height: 24px;
color: $icon-button-color;
}
@@ -12,8 +12,8 @@ Please see LICENSE files in the repository root for full details.
}
.mx_PollDetailHeader_icon {
height: 15px;
width: 15px;
height: 16px;
width: 16px;
margin-right: $spacing-8;
vertical-align: middle;
}
@@ -40,6 +40,7 @@ Please see LICENSE files in the repository root for full details.
}
.mx_ShareDialogButtons_button-icon {
height: 10px;
margin-top: 3px;
width: 20px;
height: 20px;
margin: 2px;
}
@@ -81,12 +81,10 @@ Please see LICENSE files in the repository root for full details.
}
.mx_MessageContextMenu_iconCopy::before {
height: 12px;
left: 2px;
height: 16px;
mask-image: url($copy-button-url);
position: relative;
width: 12px;
top: 3px;
width: 16px;
}
.mx_MessageContextMenu_iconEdit::before {
+4 -6
View File
@@ -121,13 +121,11 @@ Please see LICENSE files in the repository root for full details.
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
width: 16px;
height: 16px;
mask-size: 14px;
width: inherit;
height: inherit;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
left: 0;
mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
}
}
@@ -64,9 +64,9 @@ Please see LICENSE files in the repository root for full details.
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
width: 8px;
height: 8px;
mask-size: 14px;
width: inherit;
height: inherit;
position: absolute;
left: 50%;
top: 50%;
+2 -2
View File
@@ -68,8 +68,8 @@ Please see LICENSE files in the repository root for full details.
position: relative;
svg {
width: 0.5em;
vertical-align: middle;
width: 16px;
height: 16px;
}
}
}
+2 -2
View File
@@ -12,14 +12,14 @@ Please see LICENSE files in the repository root for full details.
width: 18px;
height: 18px;
img {
svg {
flex: 0 0 40px;
visibility: hidden;
}
}
&:hover .mx_LinkPreviewGroup_hide img,
.mx_LinkPreviewGroup_hide:focus-visible:focus img {
.mx_LinkPreviewGroup_hide:focus-visible:focus svg {
visibility: visible;
}
+6 -6
View File
@@ -31,14 +31,14 @@ Please see LICENSE files in the repository root for full details.
.mx_ReplyPreview_header_cancel {
background-color: $primary-content;
mask: url("@vector-im/compound-design-tokens/icons/close.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
mask-repeat: no-repeat;
mask-position: center;
mask-size: 18px;
width: 18px;
height: 18px;
min-width: 18px;
min-height: 18px;
mask-size: contain;
width: 20px;
height: 20px;
min-width: 20px;
min-height: 20px;
}
}
}
@@ -65,6 +65,7 @@ Please see LICENSE files in the repository root for full details.
height: 18px;
mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
mask-repeat: no-repeat;
mask-size: contain;
mask-size: 16px;
mask-position: center;
background: var(--cpd-color-icon-tertiary);
}
@@ -52,13 +52,12 @@ Please see LICENSE files in the repository root for full details.
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
width: 7px;
height: 7px;
mask-size: 12px;
width: inherit;
height: inherit;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
left: -1px;
top: -1px;
mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
}
}
@@ -75,12 +75,12 @@ Please see LICENSE files in the repository root for full details.
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
width: 24px;
height: 24px;
mask-size: 24px;
width: inherit;
height: inherit;
position: absolute;
left: calc(50% - 12px);
top: calc(50% - 12px);
left: 0;
top: 0;
mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
animation-duration: 300ms;