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
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
@@ -1,17 +1,9 @@
|
||||
/*
|
||||
Copyright 2024 New Vector Ltd.
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
.mx_BaseCard {
|
||||
@@ -60,10 +52,11 @@ limitations under the License.
|
||||
flex: 1;
|
||||
|
||||
.mx_BaseCard_header_title_heading {
|
||||
color: $primary-content;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
font: var(--cpd-font-body-md-medium);
|
||||
color: var(--cpd-color-text-secondary);
|
||||
}
|
||||
|
||||
.mx_BaseCard_header_title_button--option {
|
||||
@@ -98,50 +91,6 @@ limitations under the License.
|
||||
scrollbar-gutter: stable;
|
||||
}
|
||||
|
||||
.mx_BaseCard_Group {
|
||||
margin: $spacing-20 0 $spacing-16;
|
||||
|
||||
& > * {
|
||||
margin-left: $spacing-12;
|
||||
margin-right: $spacing-12;
|
||||
}
|
||||
|
||||
> h2 {
|
||||
color: $tertiary-content;
|
||||
font: var(--cpd-font-body-sm-medium);
|
||||
margin: $spacing-12;
|
||||
}
|
||||
|
||||
.mx_BaseCard_Button {
|
||||
padding: 10px;
|
||||
padding-inline-start: $spacing-12;
|
||||
margin: 0;
|
||||
position: relative;
|
||||
font: var(--cpd-font-heading-sm-medium);
|
||||
height: 20px;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
display: flex;
|
||||
|
||||
.mx_BaseCard_Button_sublabel {
|
||||
color: $tertiary-content;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(141, 151, 165, 0.1);
|
||||
}
|
||||
|
||||
&.mx_AccessibleButton_disabled {
|
||||
padding-right: $spacing-12;
|
||||
&::after {
|
||||
content: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_BaseCard_footer {
|
||||
padding-top: $spacing-4;
|
||||
text-align: center;
|
||||
|
||||
Reference in New Issue
Block a user