67d1956437
Merge branches 'develop' and 't3chguy/fix-op' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-op
2020-07-14 10:56:15 +01: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
98f3d9bd74
fix input border colour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:23:21 +01:00
cd2f323002
re-add text-align center
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:18:33 +01:00
a5a32cb5de
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-13 23:14:10 +01: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
ce365cc5a1
Optically align room header height with panel heights
2020-07-13 23:12:37 +01:00
b10195cefa
Use consistent values between right and left panels
2020-07-13 23:12:37 +01:00
145b154a01
fix left gutter based on the border-left shrinking by 1px
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:56:20 +01:00
de46c0091f
Fix UserInfo separator colour to match User Menu context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:50:18 +01:00
a40972cec9
Fix text jumps for event tile hover
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:21:06 +01:00
a1ff00a7a8
Fix scrollbar occlusion in the right panel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:13:29 +01:00
5e5620a6c2
Make widgets match the new 8px border-radius standard
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:59:46 +01:00
b45adda676
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-13 21:56:52 +01:00
93e1ba4699
Change border radius of context menus and dialog from 4px to 8px
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:56:48 +01:00
a54b18adfe
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 21:54:45 +01:00
f8e2805f38
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-13 21:53:46 +01:00
d182961283
Merge pull request #4966 from matrix-org/jryans/sticky-madness
...
Update top vs. bottom sticky styles separately
2020-07-13 21:53:18 +01:00
9007653ec6
Make room clipping list mask softer
2020-07-13 21:52:52 +01:00
d136d02f5e
Stylise right panel as card
2020-07-13 21:52:31 +01:00
6a58512397
Fix alignments
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:45:48 +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
e8e900ca1e
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-13 21:21:02 +01:00
1b9d918a92
Add new e2e icons
2020-07-13 21:20:55 +01:00
88a653445f
Fix h-alignment of the room header, timeline and composer avatars
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:15:58 +01:00
57f75736be
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-13 21:02:26 +01:00
5a85ce5d3d
Remove text decoration from links v2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:02:08 +01:00
fafbd25f6b
Tweak padding & weight
2020-07-13 20:57:24 +01:00
a3b1c93149
Tweak padding
2020-07-13 20:50:26 +01:00
Michael Telatynski