Commit Graph

636 Commits (0c06975e7a6c965641b111fb447ed77822c337dc)

Author SHA1 Message Date
Bruno Windels 952200f031 Merge branch 'develop' into element 2020-07-10 19:04:45 +02:00
Travis Ralston 477472c178 Merge branch 'develop' into travis/room-list/showmore2 2020-07-10 10:57:17 -06:00
Bruno Windels 85ac256231 cleanup 2020-07-10 18:40:09 +02:00
Bruno Windels 725b7f8950 make show more button a bit less tall 2020-07-10 18:30:52 +02:00
Bruno Windels d5a3071518 put show more button inside resizer
this way we have a flexbox layout in the resizer with:
 - the resize handle (fixed)
 - the show more/less button, if any (fixed)
 - the list of tiles (grabbing whatever is left)
2020-07-10 18:29:39 +02:00
Travis Ralston 2bf2a08e7a Mark safari hacks 2020-07-10 08:52:46 -06:00
J. Ryan Stinnett ab51dd28dc Merge remote-tracking branch 'origin/develop' into element 2020-07-10 11:08:33 +01:00
Jorik Schellekens edb556f22e Stop safari from agressivly shrinking 2020-07-10 02:15:46 +01:00
Travis Ralston 859f65659c Attempt to support a hard cutoff with the show more button
Known issues:
* Causes scroll jumps when the button gets added to DOM
* Resize handle is invisible when there's a show more button

TODO:
* Clean up comments
* Clean up useless code (all the padding stuff isn't needed)
2020-07-09 13:07:13 -06:00
Bruno Windels ce68314de9 Revert "Merge pull request #4932 from matrix-org/travis/room-list/invisible-show-more"
This reverts commit f58a0a7538.
2020-07-09 12:13:12 -06:00
Bruno Windels b95b26d19b change border radius for selected room tile 2020-07-09 19:17:47 +02:00
Bruno Windels 00f0f6dd34 add color for room list header color 2020-07-09 19:17:34 +02:00
Bruno Windels c0d2e29720 add theme variable for room header background color 2020-07-09 19:16:30 +02:00
Travis Ralston 74fa3b2c81 Fix rough badge alignment for community invite tiles again
Fixes https://github.com/vector-im/riot-web/issues/14392
2020-07-09 10:39:53 -06:00
Bruno Windels d90fc57469 Merge branch 'develop' into element 2020-07-09 17:59:56 +02:00
Bruno Windels f58a0a7538
Merge pull request #4932 from matrix-org/travis/room-list/invisible-show-more
Potential solution to supporting transparent 'show more' buttons
2020-07-09 14:43:20 +00:00
Travis Ralston bd8e1f7198
Merge pull request #4931 from matrix-org/travis/room-list/sticky-headers
Improve performance and stability in sticky headers for new room list
2020-07-09 08:00:56 -06:00
Michael Telatynski ada68c4220
Merge pull request #4892 from jugglinmike/gh-13135-highlight-jump-to-bottom
Highlight "Jump to Bottom" badge when appropriate
2020-07-09 00:20:37 +01:00
Travis Ralston 8972cf9378 Potential solution to supporting transparent 'show more' buttons
In this demonstration, we remove the cutting line (as it collides with the tile in a weird spot) and instead replace the tile with a placeholder when the text is about to collide with the avatar in the tile. We use a `round()` for this because through some amazing coincidence the collision happens at 0.47, which is close enough to 0.5 for people not to notice.
2020-07-08 16:09:45 -06:00
Travis Ralston f9aca7c05e Avoid bounding box usage in sticky headers & improve reliability
We now use offsets and scroll information to determine where the headers should be stuck to, still supporting the transparent background.

Some scroll jumps were originally introduced as part of the change in numbering, so they have been fixed here. By proxy, some additional scroll jump/instability should be fixed as well.

This has a lingering problem of still causing a huge number of no-op UI updates though, which will be dealt with in a future commit.
2020-07-08 14:37:35 -06:00
Bruno Windels 7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Bruno Windels d5747ad6c0 Merge branch 'develop' into element 2020-07-08 18:07:45 +02:00
Bruno Windels 571bd30898 update call icons 2020-07-08 18:02:30 +02:00
Jorik Schellekens 6ca7150533 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into
joriks/room-list-priorities
2020-07-08 16:08:55 +01:00
Jorik Schellekens 53bdddfcdd Fix discrepancies with style 2020-07-08 16:07:38 +01:00
Travis Ralston 3912f2d21c Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable 2020-07-08 07:55:10 -06:00
Bruno Windels 7dad56ca86 Merge branch 'develop' into element 2020-07-08 15:50:17 +02:00
Bruno Windels 269c30f8e8 Revert "also blur the sticky headers"
This reverts commit 82e0816d86.
2020-07-08 15:47:01 +02:00
Bruno Windels 989e4a9ceb
Merge pull request #4912 from matrix-org/bwindels/bettersticky
Add wrapper to room list so sticky headers don't need a background
2020-07-08 13:34:01 +00:00
Bruno Windels a8085f4e3b remove background on sticky headers 2020-07-08 14:50:08 +02:00
Michael Telatynski faa9124f2b Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
 Conflicts:
	src/components/views/rooms/RoomTile2.tsx
2020-07-08 08:57:01 +01:00
Travis Ralston 15b6a273c9 Swap out the resizer lib for something more stable
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.

The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".

For https://github.com/vector-im/riot-web/issues/14022
2020-07-07 22:21:00 -06:00
Jorik Schellekens 0906da01ba Fix gaps 2020-07-08 00:18:58 +01:00
Jorik Schellekens 92dec8ddd8 Fix gaps 2020-07-08 00:16:24 +01:00
Jorik Schellekens b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Michael Telatynski 986d56ffdc Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
	src/components/views/rooms/RoomTile2.tsx
2020-07-07 17:11:04 +01:00
Bruno Windels 7115c07c65 Merge branch 'develop' into element 2020-07-07 13:21:49 +02:00
Bruno Windels 8f47b59de8 fix margin between buttons
I think the selector wasn't working before either fwiw
2020-07-07 13:03:18 +02:00
Bruno Windels af333db6ae change settings icons 2020-07-07 12:16:03 +02:00
Mike Pennisi d237d02c03 Highlight "Jump to Bottom" badge when appropriate
This resolves https://github.com/vector-im/riot-web/issues/13135

Signed-off-by: Mike Pennisi <mike@mikepennisi.com>
2020-07-06 23:09:54 -04:00
Michael Telatynski 64237c9f4e Apply scroll margins to RoomTile so that they don't scroll under the "sticky" headers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 00:11:32 +01:00
Travis Ralston d14dd777b7 Revert "don't need to set width with javascript?"
This reverts commit a2cf641c0e.
2020-07-06 15:23:20 -06:00
Travis Ralston 70eebc978f Revert "Minor cleanup of sticky header CSS"
This reverts commit 5bf14d8427.
2020-07-06 15:22:40 -06:00
Travis Ralston 5bf14d8427 Minor cleanup of sticky header CSS 2020-07-06 14:37:38 -06:00
Bruno Windels a2cf641c0e don't need to set width with javascript? 2020-07-06 14:35:53 -06:00
Bruno Windels 8fd9dbf1d8 moar icon changes 2020-07-06 18:28:54 +02:00
Bruno Windels 2daad838ad change roomtile icons 2020-07-06 15:56:52 +02:00
Bruno Windels 137a81501a fix tooltip bg colors
introduce new color variable for inverted backgrounds like dark tooltip
2020-07-06 15:40:30 +02:00
Bruno Windels 08c44333cf Update develop 2020-07-06 09:29:23 +02:00
Travis Ralston afa71c7b7c Fix minor issues with the badges in the new room list
Fixes https://github.com/vector-im/riot-web/issues/14225
2020-07-03 14:26:59 -06:00