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

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

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	playwright/snapshots/file-upload/image-upload.spec.ts/image-upload-preview-linux.png
#	playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png
#	playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png
#	playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png
#	playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png
#	playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png
#	playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png
#	playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png
#	playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png
#	playwright/snapshots/room/room-header.spec.ts/encrypted-room-header-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-highlighted-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-long-name-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-video-room-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-highlighted-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-not-highlighted-linux.png
#	playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png
#	playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png
#	playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-linux.png
#	playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-smallscreen-linux.png
#	playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png
#	playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png
#	playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png
#	playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png
#	playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png
#	playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png
#	res/css/_common.pcss
#	res/css/structures/_SearchBox.pcss
#	res/css/structures/_UserMenu.pcss
#	res/css/views/dialogs/_UserSettingsDialog.pcss
#	res/css/views/elements/_ImageView.pcss
#	res/css/views/right_panel/_RoomSummaryCard.pcss
#	res/css/views/rooms/_PinnedEventTile.pcss
#	src/components/structures/RoomStatusBar.tsx
#	src/components/views/beacon/DialogSidebar.tsx
#	src/components/views/beacon/RoomLiveShareWarning.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/right_panel/PinnedMessagesCard.tsx
#	src/components/views/rooms/RoomKnocksBar.tsx
#	src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx
#	src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx
#	src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
This commit is contained in:
Michael Telatynski
2024-10-04 10:20:39 +01:00
parent d85d400ec1 70418f8f3d
commit 2ccac7fe57
2677 changed files with 27603 additions and 39638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/_common.pcss
+13 -23
View File
@@ -1,20 +1,12 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2024 New Vector Ltd.
Copyright 2019-2023 The Matrix.org Foundation C.I.C
Copyright 2017-2019 New Vector Ltd
Copyright 2017 Vector Creations Ltd
Copyright 2017 - 2019 New Vector Ltd
Copyright 2019 - 2023 The Matrix.org Foundation C.I.C
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.
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
Please see LICENSE files in the repository root for full details.
*/
@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
@@ -25,8 +17,6 @@ limitations under the License.
@import url("maplibre-gl/dist/maplibre-gl.css");
:root {
font-size: 10px;
--container-border-width: 8px;
--container-gap-width: 8px; /* only even numbers should be used because otherwise we get 0.5px margin values. */
--transition-short: 0.1s;
@@ -606,7 +596,7 @@ legend {
.mx_Dialog
button:not(.mx_Dialog_nonDialogButton):not([class|="maplibregl"]):not(.mx_AccessibleButton):not(
.mx_UserProfileSettings button
):not(.mx_ThemeChoicePanel_CustomTheme button),
):not(.mx_ThemeChoicePanel_CustomTheme button):not(.mx_UnpinAllDialog button),
.mx_Dialog input[type="submit"],
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
.mx_Dialog_buttons input[type="submit"] {
@@ -626,14 +616,14 @@ legend {
.mx_Dialog
button:not(.mx_Dialog_nonDialogButton):not([class|="maplibregl"]):not(.mx_AccessibleButton):not(
.mx_UserProfileSettings button
):not(.mx_ThemeChoicePanel_CustomTheme button):last-child {
):not(.mx_ThemeChoicePanel_CustomTheme button):not(.mx_UnpinAllDialog button):last-child {
margin-right: 0px;
}
.mx_Dialog
button:not(.mx_Dialog_nonDialogButton):not([class|="maplibregl"]):not(.mx_AccessibleButton):not(
.mx_UserProfileSettings button
):not(.mx_ThemeChoicePanel_CustomTheme button):focus,
):not(.mx_ThemeChoicePanel_CustomTheme button):not(.mx_UnpinAllDialog button):focus,
.mx_Dialog input[type="submit"]:focus,
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):focus,
.mx_Dialog_buttons input[type="submit"]:focus {
@@ -645,7 +635,7 @@ legend {
.mx_Dialog_buttons
button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):not(
.mx_UserProfileSettings button
):not(.mx_ThemeChoicePanel_CustomTheme button),
):not(.mx_ThemeChoicePanel_CustomTheme button):not(.mx_UnpinAllDialog button),
.mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-action-primary-rest);
@@ -658,7 +648,7 @@ legend {
.mx_Dialog_buttons
button.danger:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):not(.mx_UserProfileSettings button):not(
.mx_ThemeChoicePanel_CustomTheme button
),
):not(.mx_UnpinAllDialog button),
.mx_Dialog_buttons input[type="submit"].danger {
background-color: var(--cpd-color-bg-critical-primary);
border: solid 1px var(--cpd-color-bg-critical-primary);
@@ -674,7 +664,7 @@ legend {
.mx_Dialog
button:not(.mx_Dialog_nonDialogButton):not([class|="maplibregl"]):not(.mx_AccessibleButton):not(
.mx_UserProfileSettings button
):not(.mx_ThemeChoicePanel_CustomTheme button):disabled,
):not(.mx_ThemeChoicePanel_CustomTheme button):not(.mx_UnpinAllDialog button):disabled,
.mx_Dialog input[type="submit"]:disabled,
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):disabled,
.mx_Dialog_buttons input[type="submit"]:disabled {
@@ -851,7 +841,7 @@ legend {
@define-mixin ThreadSummaryIcon {
content: "";
display: inline-block;
mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/threads.svg");
mask-position: center;
mask-repeat: no-repeat;
mask-size: contain;