Commit Graph

3533 Commits (50c27ebed7744423ee4799bcf2d4d597d90810b7)

Author SHA1 Message Date
Šimon Brandner b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Michael Telatynski 4fe0e216d6 Use div instead of span for mx_MImageBody to not violate spec 2021-07-23 16:22:35 +01:00
Michael Telatynski 5f2582395f Fix blurhash rounded corners missing regression 2021-07-23 16:21:59 +01:00
Michael Telatynski c7a24746f5
Merge pull request #6462 from matrix-org/t3chguy/fix/18182 2021-07-23 14:52:56 +01:00
Germain Souquet 42b213ba8c Fix clipped avatar in room list 2021-07-23 14:17:26 +02:00
Michael Telatynski 2b133deb63 fix scroll behaviour to match that of prior to the spinner fix 2021-07-23 12:19:54 +01:00
Michael Telatynski 4a4ec596bd Fix position of the space hierarchy spinner 2021-07-23 11:27:00 +01:00
Germain Souquet f99c0fad3e Make inline events feel less claustrophobic in bubble layout 2021-07-23 11:40:34 +02:00
Michael Telatynski 358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Germain ffcc9631df
Merge pull request #6449 from matrix-org/gsouquet/fix-18153
Add event selected state for message bubbles
2021-07-23 08:10:50 +01:00
Michael Telatynski d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028 2021-07-23 06:12:02 +01:00
Šimon Brandner bd46275ec6
Don't show scrollbar for url previews
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:48:17 +02:00
Germain 248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142
Fix avatar obstructing membership and state changes
2021-07-22 16:16:33 +01:00
Šimon Brandner 2841383e82
rethemendex
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:10:57 +02:00
Germain Souquet 224a9db3ec Add event selected state for message bubbles 2021-07-22 16:48:55 +02:00
Germain 09186f8ee9
Merge pull request #6446 from matrix-org/gsouquet/fix-18145
Always display the Sender in the reply tile
2021-07-22 15:12:09 +01:00
Germain Souquet 02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Germain 78ae4ebc1e
Merge pull request #6444 from matrix-org/gsouquet/fix-18121
Add right padding for event replies
2021-07-22 14:28:13 +01:00
Germain Souquet 229d139568 Always display the Sender in the reply tile 2021-07-22 15:23:08 +02:00
Germain Souquet 8a9d89ae85 Fix event tile cut off in share preview 2021-07-22 15:05:44 +02:00
Germain Souquet 2e173d7810 Add right padding for event replies 2021-07-22 14:38:57 +02:00
Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Michael Telatynski 88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes 2021-07-22 12:20:27 +01:00
Germain 951ceb194c
Merge pull request #6438 from matrix-org/gsouquet/fix-18074
Prevent action bar to overlap the event content
2021-07-22 12:14:29 +01:00
Šimon Brandner 6ae320831a
Make quotes thinner
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
Travis Ralston c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
Šimon Brandner 85e08d5074
Revert 100%
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02:00
Travis Ralston b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours
Clean up visual style of files and voice messages
2021-07-22 03:39:29 -06:00
Germain Souquet 8da2d0fe72 Fix avatar obstructing membership and state changes 2021-07-22 11:31:46 +02:00
Germain Souquet 9180d478eb Prevent action bar to overlap the event content 2021-07-22 11:00:34 +02:00
Šimon Brandner 8695beb7ca
Fix overflow issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 10:03:22 +02:00
Šimon Brandner 2873bf6c3c
Make feeds bit a smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:50:56 +02:00
Šimon Brandner 72948b9167
Keep aspect ratio for voice feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:45:33 +02:00
Germain 51178735c9
Merge pull request #6428 from matrix-org/gsouquet/fix-18129 2021-07-22 08:44:40 +01:00
Šimon Brandner 7ad62a8b1a
Reorganize some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:06:20 +02:00
Travis Ralston fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors
Make diff colors in codeblocks more pleasant
2021-07-21 20:02:03 -06:00
Travis Ralston ca1a1e488a Take out the jump when recording a voice message 2021-07-21 14:47:42 -06:00
Travis Ralston 56290f3d01 Force padding overrides to take precedence over MediaBody styles 2021-07-21 14:47:27 -06:00
Travis Ralston 87ac2d7cc5 Move padding and width to MediaBody styles 2021-07-21 14:47:02 -06:00
Travis Ralston 3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06:00
Travis Ralston 5386d23008 Fix voice message tile taking up a couple extra px at the bottom
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
Travis Ralston e430381abc Update colour scheme for message panels
Fixes https://github.com/vector-im/element-web/issues/18113
2021-07-21 13:11:11 -06:00
Šimon Brandner d243f7bad8
Move some CSS to a more correct place
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:30:25 +02:00
Šimon Brandner 3fac4adfc7
Fix feed sizing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02:00
Šimon Brandner dc7f6d8286
Show sidebar in PiP mode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02:00
Germain 22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Šimon Brandner be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02:00
Germain Souquet 0fb210cadb Increase hit area for timestamp in message bubbles 2021-07-21 15:31:10 +02:00
Germain Souquet c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Germain 32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00