f452abf822
Merge branch 'jryans/font-text' into 'element'
...
Fix font input branding
See merge request new-vector/element/element-web/matrix-react-sdk!14
2020-07-14 17:08:20 +00:00
c0a552bfb0
Fix font input branding
2020-07-14 18:04:29 +01:00
b1444146e6
rename traces of element(-dark) theme in code
2020-07-14 18:40:32 +02:00
f47268ce74
Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"
...
This reverts merge request !9
2020-07-14 16:23:06 +00:00
ea511faafe
Merge remote-tracking branch 'origin/develop' into element
2020-07-14 16:57:00 +01:00
e1b34acdc8
Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug
...
Remove debug logging from new room list
2020-07-14 09:56:17 -06:00
ebbcbe231a
Merge branch 'nadonomy/ui-tweaks-part-deux' into 'element'
...
UI tweaks - part deux
See merge request new-vector/element/element-web/matrix-react-sdk!8
2020-07-14 13:47:10 +00:00
5294349dc3
Remove base domain from instance name
2020-07-14 14:32:52 +01:00
d3944b9e67
Use element theme
2020-07-14 14:19:42 +01:00
71dc6e8e10
Update missing var to use element theme
2020-07-14 14:15:24 +01:00
5b3c3f53fe
Use element theme by default
2020-07-14 13:56:24 +01:00
b6a5fa38e1
Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
...
# Conflicts:
# res/css/views/rooms/_RoomSublist2.scss
2020-07-14 12:40:52 +00:00
4f466300b7
Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element
2020-07-14 14:32:08 +02:00
4fe4788c2e
Merge branch 'develop' into element
2020-07-14 14:31:31 +02:00
9c5f7492e3
undo changes which are no longer needed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:53:55 +01:00
507d493b60
Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux
2020-07-14 12:42:58 +01:00
4e8203cca1
revert some changes to resolve what looks like a props mutation race-condition
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:42:51 +01:00
a09f773edd
Tweak sticky header hiding to avoid pop
...
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.
To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).
Fixes https://github.com/vector-im/riot-web/issues/14429
2020-07-14 12:16:17 +01:00
106c91aec0
Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
...
# Conflicts:
# res/css/views/rooms/_RoomSublist2.scss
2020-07-14 09:26:04 +00:00
aea3ad48b5
Merge remote-tracking branch 'origin/develop' into element
2020-07-14 10:17:43 +01:00
f394190423
Merge pull request #4973 from matrix-org/t3chguy/room-list/14395
...
Fix show-all keyboard focus regression
2020-07-14 09:56:03 +01:00
03f94779f1
Fix show-all keyboard focus regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 09:38:31 +01:00
f16962bb41
Merge pull request #4970 from matrix-org/travis/room-list/prelaunch/1-cleanup
...
Clean up TODOs, comments, and imports in the new room list
2020-07-14 09:38:30 +01:00
e5c199952d
Merge pull request #4971 from matrix-org/travis/room-list/prelaunch/2-membership
...
Make EffectiveMembership utils generic
2020-07-14 09:36:45 +01:00
6632db01cf
Remove debug logging from new room list
...
Fixes https://github.com/vector-im/riot-web/issues/14408
Yes, all the issue references are wrong :(
2020-07-13 20:34:05 -06:00
4a8a59c578
Make EffectiveMembership utils generic
...
Fixes https://github.com/vector-im/riot-web/issues/14460
Just have to move them to utils.
2020-07-13 20:29:46 -06:00
bdb136e24e
Clean up TODOs, comments, and imports in the new room list
...
Fixes https://github.com/vector-im/riot-web/issues/14412
2020-07-13 20:25:02 -06:00
917c41dfa0
Update sticky headers when breadcrumbs pop in or out
...
Fixes https://github.com/vector-im/riot-web/issues/14455
2020-07-13 20:08:12 -06:00
126aa862db
Merge pull request #4967 from matrix-org/travis/room-list/fix-show-less
...
Fix show less button occluding the last tile
2020-07-13 19:51:26 -06:00
80cf2839d9
Ensure breadcrumbs don't keep turning themselves back on
...
Fixes https://github.com/vector-im/riot-web/issues/14452
2020-07-13 18:46:17 -06:00
d4e397cbd0
Switch to svg masks for the e2eicon and border it for the EntityTile avatars
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 00:52:03 +01:00
4d432f23e4
Fix room header timeline and composer alignment
...
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
a3a1e2e01f
Fix show less button occluding the last tile
...
Fixes https://github.com/vector-im/riot-web/issues/14450
People may have to click various combinations of 'show more' and 'show less' until it fixes itself, as their layout could be a bit weird now.
2020-07-13 16:38:13 -06:00
646c5d4a64
Replace timeline tooltips to match breadcrumb tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
a54b18adfe
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 21:54:45 +01:00
f47e94259e
Merge branch 'jryans/rename-strings' into 'element'
...
Update server dialog, analytics
See merge request new-vector/element/element-web/matrix-react-sdk!7
2020-07-13 20:43:53 +00:00
4b5faf8148
Update top vs. bottom sticky styles separately
...
If a sublist changes from sticky top to sticky bottom in a single run of the
logic (without passing through the default state), we were leaving the previous
top position set. This handles them independently to resolve this.
Fixes https://github.com/vector-im/riot-web/issues/14390
Maybe helps with https://github.com/vector-im/riot-web/issues/14443
For vector-im/riot-web#13635
2020-07-13 21:24:47 +01:00
b50c809d35
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 20:28:57 +01:00
edb19786ec
Merge pull request #4965 from matrix-org/travis/room-list/logout
...
Ensure RoomListStore2 gets reset when the client becomes invalidated
2020-07-13 13:26:20 -06:00
19500cf96a
Allow the tests to force a MatrixClient
2020-07-13 13:24:02 -06:00
eb78b1b328
Export the matrix client from the store
2020-07-13 13:18:01 -06:00
a8829f09d0
Ensure RoomListStore2 gets reset when the client becomes invalidated
...
Fixes https://github.com/vector-im/riot-web/issues/14384
We also make use of the new AsyncStore type to handle this more safely.
2020-07-13 13:15:44 -06:00
8e982f52ff
Fix extra room tiles being rendered on smaller sublists
...
Fixes https://github.com/vector-im/riot-web/issues/14426
The issue only applies to lists which won't have a 'show less' button, as the lists with the button would have the button's height considered when determining visible tiles. For lists that were under that (1-4 rooms), the show more button wasn't being considered and thus leading to the padding being added rather than subtracted, causing an extra tile to render.
By ensuring we include the padding for both show more and show less, we ensure that no extra tiles get rendered and that the cutoff semantics are still present.
2020-07-13 12:59:09 -06:00
1f57b85b30
Merge pull request #4962 from matrix-org/travis/room-list/leave-fix
...
Ensure tag changes (leaving rooms) causes rooms to move between lists
2020-07-13 12:44:23 -06:00
d6ca05938d
Merge pull request #4960 from matrix-org/travis/room-list/default-order
...
Fix default sorting mechanics for new room list
2020-07-13 12:01:37 -06:00
d2c7a55fa0
Ensure tag changes (leaving rooms) causes rooms to move between lists
...
Fixes https://github.com/vector-im/riot-web/issues/14442
Turns out that we are so good at moving a room that when it flows through as a TIMELINE update the algorithm no-ops and does nothing, so don't do that.
2020-07-13 12:00:56 -06:00
995a7879a1
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 18:49:55 +01:00
f0c6139803
Update analytics host tracking for new structure
2020-07-13 17:57:56 +01:00
231c26c8a4
Update CustomServerDialog to use brand token
2020-07-13 17:57:56 +01:00
33422f1744
Switch out Labs spinner to be the Flow-generated from Design
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:39:57 +01:00
J. Ryan Stinnett