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

..

_common_CryptoEvent.scss

put this just on the buttons

2021-07-01 15:22:44 +01:00

_CreateEvent.scss

Update res/css/views/messages/_CreateEvent.scss

2020-11-05 16:08:36 +00:00

_DateSeparator.scss

Use variables for the rem values.

2020-03-31 15:26:23 +01:00

_EventTileBubble.scss

delint

2020-11-05 15:54:21 +00:00

_MediaBody.scss

Unify audio message types to new media body

2021-06-24 11:38:35 -06:00

_MEmoteBody.scss

move components' CSS to be in the same repo as their JS

2018-04-12 00:23:58 +01:00

_MessageActionBar.scss

Update _MessageActionBar.scss

2021-05-19 12:11:24 +01:00

_MessageTimestamp.scss

Use OpenType tabular numbers in timestamps

2020-07-23 14:52:01 +01:00

_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

Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth

2020-11-04 17:06:38 +00:00

_MjolnirBody.scss

Appease the other linter

2019-10-31 16:30:51 -06:00

_MNoticeBody.scss

move components' CSS to be in the same repo as their JS

2018-04-12 00:23:58 +01:00

_MStickerBody.scss

Add an option to hide image previews

2019-09-27 21:08:31 -06:00

_MTextBody.scss

move css rule to be more generic; remove overriden rule

2018-06-13 19:08:24 +01:00

_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

_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

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

_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

Bring back UnknownBody for UISIs

2020-05-08 19:15:59 +01:00

_ViewSourceEvent.scss

Move and use icons from widget dir

2021-02-08 15:22:10 +01:00