 Michael Telatynski
|
2ccac7fe57
|
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
|
2024-10-04 10:48:28 +01:00 |
|
 David Langley
|
491f0cd08a
|
Change license (#13)
* Copyright headers 1
* Licence headers 2
* Copyright Headers 3
* Copyright Headers 4
* Copyright Headers 5
* Copyright Headers 6
* Copyright headers 7
* Add copyright headers for html and config file
* Replace license files and update package.json
* Update with CLA
* lint
|
2024-09-09 13:57:16 +00:00 |
|
|
Michael Telatynski
|
773b93e96d
|
De-duplicate icons using Compound Design Tokens
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2024-07-22 09:56:53 +01:00 |
|
 Michael Weimann
|
526645c791
|
Apply prettier formatting
|
2022-12-12 12:24:14 +01:00 |
|
|
Michael Telatynski
|
01f4bb8c78
|
Rename PostCSS files to .pcss (#9013)
* Rename PostCSS files to `.pcss`
* Make Stylelint happy
* Delint
* Rename new files too
* delint
* Fix bad comment placement
|
2022-07-15 14:53:23 +01:00 |
|