Commit Graph

2911 Commits (619231883fe2198c94ea4d0008680af304a9b33f)

Author SHA1 Message Date
Šimon Brandner 1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 08:19:29 +02:00
Michael Telatynski 93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Germain a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event
Fix mx_Event containment rules and empty read avatar row
2021-06-03 16:38:55 +01:00
Germain Souquet 5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Germain 7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Germain Souquet a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Germain 430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment
Add CSS containment rules for shorter reflow operations
2021-06-03 08:10:29 +01:00
Germain Souquet bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain 9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett 2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius
Tweak event border radius to match action bar
2021-06-02 11:39:54 +01:00
J. Ryan Stinnett 234c65b331 Tweak event border radius to match action bar
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
2021-06-02 10:25:29 +01:00
Germain Souquet ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Michael Telatynski b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Germain Souquet d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Germain Souquet 18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00
Germain Souquet 1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Germain Souquet aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Michael Telatynski 54d8953024 delint 2021-05-26 14:00:53 +01:00
Michael Telatynski 27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski 59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet 36dddea338 remove CSS out of sync comment 2021-05-25 14:57:07 +01:00
Germain Souquet 7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski 13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
J. Ryan Stinnett 45678de9a1 Stop overscroll in Firefox Nightly for macOS
Firefox is working on an overscroll feature for macOS, similar to the one Safari
has had for some time now. It doesn't really make sense in an application
context, so this disables it.
2021-05-25 11:29:59 +01:00
Nique Woodhouse 153d0ae66d
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui
Improve styling of the message action bar
2021-05-24 13:30:27 +01:00
Germain Souquet ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Michael Telatynski a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Robin Townsend 332412782e Remove logo spinner
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Travis Ralston 767c7a1e38
Merge pull request #5680 from robintown/better-spinners
Vectorize spinners
2021-05-20 13:31:35 -06:00
Germain Souquet f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Šimon Brandner 340bbeec4f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-20 15:50:49 +02:00
Michael Telatynski aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski abd290938a Fix room name not wrapping in summary card 2021-05-19 17:12:25 +01:00
Nique Woodhouse 8d072cedff Update _MessageActionBar.scss
Correct error on css hover for message action button background colour change
2021-05-19 12:11:24 +01:00
Nique Woodhouse 5daca41bfb Update _MessageActionBar.scss
Increase size of buttons
2021-05-19 11:17:34 +01:00
Nique Woodhouse 8a3db3b40a Update _MessageActionBar.scss
Refine UI of message action bar to increase usability and focus on bar content.
2021-05-19 10:25:54 +01:00
Šimon Brandner 17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Michael Telatynski f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00
Robin Townsend 555b2e3266 Reuse Spinner styles for InlineSpinner
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:00:54 -04:00
Robin Townsend 74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Michael Telatynski c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276
Decorate room avatars with publicity in add existing to space flow
2021-05-14 11:23:46 +01:00
Michael Telatynski 4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski bdeb4b3bae
Merge pull request #6037 from matrix-org/niquewoodhouse-room-sublist-button-feedback
Increase hover feedback on room sub list buttons
2021-05-14 10:55:32 +01:00
Nique Woodhouse 486350cba2 Update _RoomSublist.scss 2021-05-14 10:41:32 +01:00
Nique Woodhouse 6acf2543f0 Update _RoomSublist.scss
Fix indentation and remove random spurious blank line
2021-05-14 10:38:37 +01:00
Nique Woodhouse b71bc88514 Update _RoomSublist.scss
Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list.

Add background color on hover to RoomSublist buttons to provide more visual feedback.
2021-05-14 09:22:40 +01:00
Michael Telatynski 5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00