mirror of
https://github.com/Novaloop-AG/healthchat-web.git
synced 2026-11-07 06:58:25 +00:00
Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into t3chguy/dedup-icons
# Conflicts: # res/css/views/rooms/_MessageComposerFormatBar.pcss # src/components/views/elements/Pill.tsx # src/components/views/messages/MessageActionBar.tsx # src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
This commit is contained in:
@@ -55,6 +55,7 @@ Please see LICENSE files in the repository root for full details.
|
||||
width: 100%;
|
||||
mask-repeat: no-repeat;
|
||||
mask-position: center;
|
||||
mask-size: 20px;
|
||||
background-color: var(--cpd-color-icon-secondary);
|
||||
}
|
||||
|
||||
@@ -84,7 +85,6 @@ Please see LICENSE files in the repository root for full details.
|
||||
|
||||
.mx_MessageComposerFormatBar_buttonIconInsertLink::after {
|
||||
mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
|
||||
mask-size: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user