cad4029b1c
Merge branch 'revert-d13ade6f' into 'element'
...
Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"
See merge request new-vector/element/element-web/matrix-react-sdk!12
2020-07-14 16:23:37 +00: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
00ee670077
Merge branch 'travis/room-list/EL-tagpanel-scroll' into 'element'
...
Remove extraneous scrollbar on TagPanel when few communities are shown
See merge request new-vector/element/element-web/matrix-react-sdk!10
2020-07-14 15:16:51 +00:00
d7e8dbbab5
Remove extraneous scrollbar on TagPanel when few communities are shown
2020-07-14 09:08:07 -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
d13ade6f89
Merge branch 'nadonomy/use-element-theme' into 'element'
...
Use element theme by default
See merge request new-vector/element/element-web/matrix-react-sdk!9
2020-07-14 13:25:41 +00: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
7ff3e6a26d
bring back padding between show more and resize handle
2020-07-14 15:09:53 +02: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
9700e7e269
Tweak blur & alpha on panels
2020-07-14 13:35:31 +01: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
70951614e4
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 13:30:55 +01:00
fcf5fc0990
Fix normal e2e icon colour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 13:30:05 +01:00
309c178d73
Merge pull request #4974 from matrix-org/jryans/sticky-pop
...
Tweak sticky header hiding to avoid pop
2020-07-14 12:29:53 +00:00
1180bb722a
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 14:25:36 +02:00
1578b1c3d3
different blur radius for dark theme
2020-07-14 14:24:35 +02:00
9f199758b9
restore old tooltip positioning (right) instead of (above) for timeline tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 13:00:25 +01: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
c936439ad5
only remove underline for links in element theme
2020-07-14 12:52:28 +02:00
488f49dc5c
redefine variable rather than picking a different one
...
to not break other teams
2020-07-14 12:51:51 +02:00
0cb0d2a4eb
Apply 1 suggestion(s) to 1 file(s)
2020-07-14 09:27:53 +00: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
6735724379
Merge pull request #4969 from matrix-org/travis/room-list/breadcrumbs-headers
...
Update sticky headers when breadcrumbs pop in or out
2020-07-14 09:36:20 +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
7f15c99f65
Merge pull request #4968 from matrix-org/travis/room-list/breadcrumbs-toggle
...
Ensure breadcrumbs don't keep turning themselves back on
2020-07-13 19:51:12 -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
9d7a7c707f
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 00:52:07 +01: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
d70b510d81
Tweak panel colours
2020-07-14 00:06:12 +01:00
d0d61e7e3c
Improve legibility of room headers
2020-07-14 00:06:12 +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
Bruno Windels