1ce3ae0cf2
Merge pull request #4952 from matrix-org/t3chguy/room-list/14413
...
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
2020-07-13 15:57:27 +01:00
213e2df9fc
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 08:49:04 +01:00
bdb641279a
Merge branch 'develop' into travis/room-list/enable
2020-07-10 11:11:25 -06:00
477472c178
Merge branch 'develop' into travis/room-list/showmore2
2020-07-10 10:57:17 -06:00
85ac256231
cleanup
2020-07-10 18:40:09 +02:00
725b7f8950
make show more button a bit less tall
2020-07-10 18:30:52 +02:00
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
bf0a503e44
[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable
2020-07-10 10:18:12 -06:00
976f7381ab
Merge remote-tracking branch 'origin/joriks/room-list-fix-search-padding' into develop
2020-07-10 08:53:30 -06:00
2bf2a08e7a
Mark safari hacks
2020-07-10 08:52:46 -06:00
37a8b68539
Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop
2020-07-10 08:51:31 -06:00
42e101340e
Merge pull request #4942 from matrix-org/joriks/room-list-breadcrumbs-scroll-fade
...
Scroll fade for breadcrumbs
2020-07-10 10:37:55 +00:00
75dbd5f1d4
Merge branch 'develop' into travis/room-list/enable
2020-07-09 22:28:16 -06:00
e4366632cf
Fix search padding
2020-07-10 02:54:11 +01:00
edb556f22e
Stop safari from agressivly shrinking
2020-07-10 02:15:46 +01:00
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
e2539f11cd
Scroll fade for breadcrumbs
2020-07-09 19:24:02 +01:00
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
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
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
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
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
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
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
eb38d80bd5
Merge pull request #4920 from matrix-org/joriks/room-list-priorities
...
Enable options to favourite and low priority rooms
2020-07-08 10:08:02 -06:00
0368bff5b1
Merge pull request #4904 from matrix-org/joriks/room-list-voip
...
Move voip previews to bottom right corner
2020-07-08 10:07:42 -06:00
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
53bdddfcdd
Fix discrepancies with style
2020-07-08 16:07:38 +01:00
3912f2d21c
Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable
2020-07-08 07:55:10 -06:00
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
a8085f4e3b
remove background on sticky headers
2020-07-08 14:50:08 +02:00
0d94cfa97a
put sticky headers in padding of wrapper
...
this way they don't need a background, as the list is already clipped
2020-07-08 14:49:38 +02:00
75751abc60
add wrapper we can then add padding to when sticking headers
2020-07-08 14:49:04 +02:00
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
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
0906da01ba
Fix gaps
2020-07-08 00:18:58 +01:00
92dec8ddd8
Fix gaps
2020-07-08 00:16:24 +01:00
b3f50b6e17
Enable options to favourite and low priority rooms
2020-07-07 23:14:04 +01:00
a59a8b76a9
Update TODO comments to point to new issue
2020-07-07 14:51:43 -06:00
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
6b5eaca0b9
Remove comment
2020-07-07 16:45:43 +01:00
da1d1ffa09
Change colour to orange and do some lints
2020-07-07 15:42:54 +01:00
0d6e7759d0
Fix review details
...
- spelling mistake
- unwatch watched setting
- lint (indentation)
- use more performant component
2020-07-07 15:11:08 +01:00
527fe24cd6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/room-list-voip
2020-07-07 15:04:22 +01:00
69852ecef4
Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123
...
Conflicts:
src/components/views/rooms/RoomSublist2.tsx
2020-07-07 14:10:58 +01:00
8f47b59de8
fix margin between buttons
...
I think the selector wasn't working before either fwiw
2020-07-07 13:03:18 +02:00
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
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
5176685d20
Implement incoming call box
2020-07-06 23:05:00 +01:00
d14dd777b7
Revert "don't need to set width with javascript?"
...
This reverts commit a2cf641c0e
2020-07-06 15:23:20 -06:00
Michael Telatynski