Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: src/ContentMessages.tsx src/components/structures/UploadBar.tsx src/components/views/messages/MImageBody.js src/components/views/messages/MStickerBody.js src/components/views/messages/MVideoBody.tsx		2021-07-01 20:48:34 +01:00
..
_CreateEvent.scss	Update res/css/views/messages/_CreateEvent.scss	2020-11-05 16:08:36 +00:00
_DateSeparator.scss	…
_EventTileBubble.scss	…
_MEmoteBody.scss	…
_MFileBody.scss	Update visual style of plain files in the timeline	2021-05-04 21:13:37 -06:00
_MImageBody.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash	2021-07-01 20:48:34 +01:00
_MJitsiWidgetEvent.scss	…
_MNoticeBody.scss	…
_MStickerBody.scss	…
_MTextBody.scss	…
_MVideoBody.scss	Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes"	2021-02-23 12:03:08 +00:00
_MVoiceMessageBody.scss	Simple rendering of voice messages in the timeline	2021-05-03 11:41:14 -06:00
_MediaBody.scss	Unify audio message types to new media body	2021-06-24 11:38:35 -06:00
_MessageActionBar.scss	Update _MessageActionBar.scss	2021-05-19 12:11:24 +01:00
_MessageTimestamp.scss	…
_MjolnirBody.scss	…
_ReactionsRow.scss	Fix add reactions prompt button jumping timeline if font set lower than default	2021-05-17 10:01:24 +01:00
_ReactionsRowButton.scss	Tweak alignment of reactions row, move add reaction to right and only show on hover	2021-05-13 13:32:38 +01:00
_RedactedBody.scss	Fix trash alignment	2021-02-03 08:15:59 +01:00
_RoomAvatarEvent.scss	…
_SenderProfile.scss	Use the same styling as for mx_TextualEvent	2021-06-10 15:31:27 +02:00
_TextualEvent.scss	Make pinned message text clickable	2021-06-24 10:41:55 +02:00
_UnknownBody.scss	…
_ViewSourceEvent.scss	Move and use icons from widget dir	2021-02-08 15:22:10 +01:00
_common_CryptoEvent.scss	put this just on the buttons	2021-07-01 15:22:44 +01:00