ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-07 06:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/dedup-icons-17oct

Browse Source 
# Conflicts:
#	res/css/structures/_GenericDropdownMenu.pcss
#	res/css/views/elements/_ImageView.pcss
#	res/css/views/rooms/_MessageComposer.pcss
#	src/components/structures/RoomStatusBar.tsx
#	src/components/views/elements/Pill.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/rooms/RoomKnocksBar.tsx
#	src/components/views/rooms/RoomTileSubtitle.tsx
#	src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx
This commit is contained in:
Michael Telatynski
2024-10-18 15:17:07 +01:00
parent e9e66cc716 90e8c13c0f
commit a71134df0f
224 changed files with 1057 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/structures/_GenericDropdownMenu.pcss
+4 -4
View File
@@ -99,10 +99,10 @@ Please see LICENSE files in the repository root for full details.
&[aria-checked="true"]::before {
content: "";
width: 12px;
height: 12px;
margin-left: -20px;
margin-right: 8px;
width: 16px;
height: 16px;
margin-left: -22px;
margin-right: 6px;
mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
mask-size: 100%;
mask-repeat: no-repeat;
res/css/views/elements/_ImageView.pcss
+1
View File
@@ -130,6 +130,7 @@ $button-gap: 24px;
.mx_ImageView_button_more::before {
mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
mask-size: 28px;
}
.mx_ImageView_button_close {
res/css/views/messages/_MessageActionBar.pcss
+4
View File
@@ -122,4 +122,8 @@ Please see LICENSE files in the repository root for full details.
--MessageActionBar-icon-size: 12px;
}
}
.mx_MessageActionBar_optionsButton {
--MessageActionBar-icon-size: 22px;
}
}
res/css/views/rooms/_MessageComposer.pcss
+2 -1
View File
@@ -278,6 +278,7 @@ Please see LICENSE files in the repository root for full details.
.mx_MessageComposer_buttonMenu::before {
mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
mask-size: 24px;
}
.mx_MessageComposer_sendMessage {
@@ -295,7 +296,7 @@ Please see LICENSE files in the repository root for full details.
top: 8px;
left: 9px;
mask-image: url("@vector-im/compound-design-tokens/icons/send-solid.svg");
mask-image: url("$(res)/img/element-icons/send-message.svg");
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;