Bruno Windels
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
Michael Telatynski
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
Michael Telatynski
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
Nad Chishtie
d70b510d81
Tweak panel colours
2020-07-14 00:06:12 +01:00
Nad Chishtie
d0d61e7e3c
Improve legibility of room headers
2020-07-14 00:06:12 +01:00
Michael Telatynski
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
Michael Telatynski
98f3d9bd74
fix input border colour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:23:21 +01:00
Michael Telatynski
cd2f323002
re-add text-align center
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:18:33 +01:00
Michael Telatynski
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
Michael Telatynski
646c5d4a64
Replace timeline tooltips to match breadcrumb tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
Nad Chishtie
ce365cc5a1
Optically align room header height with panel heights
2020-07-13 23:12:37 +01:00
Nad Chishtie
b10195cefa
Use consistent values between right and left panels
2020-07-13 23:12:37 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
a40972cec9
Fix text jumps for event tile hover
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:21:06 +01:00
Michael Telatynski
a1ff00a7a8
Fix scrollbar occlusion in the right panel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:13:29 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
Nad Chishtie
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
Nad Chishtie
9007653ec6
Make room clipping list mask softer
2020-07-13 21:52:52 +01:00
Nad Chishtie
d136d02f5e
Stylise right panel as card
2020-07-13 21:52:31 +01:00
Michael Telatynski
6a58512397
Fix alignments
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:45:48 +01:00
Michael Telatynski
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
Nad Chishtie
1b9d918a92
Add new e2e icons
2020-07-13 21:20:55 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
5a85ce5d3d
Remove text decoration from links v2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:02:08 +01:00
Nad Chishtie
fafbd25f6b
Tweak padding & weight
2020-07-13 20:57:24 +01:00
Nad Chishtie
a3b1c93149
Tweak padding
2020-07-13 20:50:26 +01:00
Michael Telatynski
a19f0fac2f
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 20:48:28 +01:00
Michael Telatynski
21a8f2298e
Remove text decoration from links
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:48:19 +01:00
Nad Chishtie
87a8dc4ff0
Improve spacing
2020-07-13 20:41:18 +01:00
Michael Telatynski
69929134c5
add spacing between sublists of 4px
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:40:42 +01:00
Michael Telatynski
4244c67aca
Fix even spacing between sticky and non-sticky headers
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:29:08 +01:00
J. Ryan Stinnett
b50c809d35
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 20:28:57 +01:00
J. Ryan Stinnett
571209afbe
Merge pull request #4963 from matrix-org/joriks/room-list-gradient
...
Add fade to show more button on room list
2020-07-13 20:21:48 +01:00
Nad Chishtie
dec377a448
Temporarily apply Joriks CSS fix
2020-07-13 20:15:09 +01:00
Nad Chishtie
b28bb34cb7
Small tweaks to padding and sizing
2020-07-13 20:13:20 +01:00
Jorik Schellekens
c9e231c3eb
Add fad
2020-07-13 19:03:31 +01:00
J. Ryan Stinnett
995a7879a1
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 18:49:55 +01:00
Michael Telatynski
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
Bruno Windels
c346122adf
align room header with user menu button
2020-07-13 18:24:28 +02:00
Bruno Windels
ec65083c61
polish user menu button
2020-07-13 18:24:28 +02:00
Bruno Windels
19ebf3beec
make overscroll gradients smaller so they pop less when appearing
2020-07-13 18:24:28 +02:00
Bruno Windels
b19afe4d46
reduce distance between tiles to 12px, so we can align things in LP with
2020-07-13 18:24:28 +02:00
Bruno Windels
965856aa55
align breadcrumbs with community avatar grid
2020-07-13 18:24:28 +02:00
Bruno Windels
375f6fa4d8
make search field 32px high, just like avatars
2020-07-13 18:24:28 +02:00
Bruno Windels
02b27086da
swap search field and breadcrumbs
2020-07-13 18:24:28 +02:00
Jorik Schellekens
cd83f12a82
Fix badges for font size 20
2020-07-13 16:11:21 +01:00
Michael Telatynski
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
Michael Telatynski
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
Travis Ralston
bdb641279a
Merge branch 'develop' into travis/room-list/enable
2020-07-10 11:11:25 -06:00
David Baker
503159c1c8
Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'
...
Add in-app rebranding toasts & prompts
See merge request new-vector/element/element-web/matrix-react-sdk!1
2020-07-10 17:09:17 +00:00
Bruno Windels
a2cb6f375a
fix padding upon Nads request
2020-07-10 19:06:48 +02:00
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
bf0a503e44
[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable
2020-07-10 10:18:12 -06:00
Travis Ralston
976f7381ab
Merge remote-tracking branch 'origin/joriks/room-list-fix-search-padding' into develop
2020-07-10 08:53:30 -06:00
Travis Ralston
2bf2a08e7a
Mark safari hacks
2020-07-10 08:52:46 -06:00
Travis Ralston
37a8b68539
Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop
2020-07-10 08:51:31 -06:00
David Baker
8701e9293e
Add in-app rebranding toasts & prompts
...
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
2020-07-10 15:32:34 +01:00
Bruno Windels
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
Bruno Windels
7880c10b21
Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element
2020-07-10 12:28:47 +02:00
Bruno Windels
6dc7a5631b
make tag panel less wide
2020-07-10 12:27:48 +02:00
J. Ryan Stinnett
ab51dd28dc
Merge remote-tracking branch 'origin/develop' into element
2020-07-10 11:08:33 +01:00
Bruno Windels
f2f813c43c
make tag panel context menu icons follow text color
2020-07-10 10:20:26 +02:00
Travis Ralston
75dbd5f1d4
Merge branch 'develop' into travis/room-list/enable
2020-07-09 22:28:16 -06:00
Jorik Schellekens
e4366632cf
Fix search padding
2020-07-10 02:54:11 +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
Jorik Schellekens
e2539f11cd
Scroll fade for breadcrumbs
2020-07-09 19:24:02 +01: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
Bruno Windels
eb706951db
dark theme color adjustments
2020-07-09 19:15:44 +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
Bruno Windels
0d53521e83
dark theme WIP
2020-07-09 14:48:15 +02: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
Travis Ralston
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
Bruno Windels
d5747ad6c0
Merge branch 'develop' into element
2020-07-08 18:07:45 +02:00
Travis Ralston
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
Bruno Windels
7da2b5d92f
fix muted video icon center
2020-07-08 18:06:11 +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
Bruno Windels
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
Bruno Windels
75751abc60
add wrapper we can then add padding to when sticking headers
2020-07-08 14:49:04 +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
Travis Ralston
a59a8b76a9
Update TODO comments to point to new issue
2020-07-07 14:51:43 -06: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
Jorik Schellekens
6b5eaca0b9
Remove comment
2020-07-07 16:45:43 +01:00
Jorik Schellekens
da1d1ffa09
Change colour to orange and do some lints
2020-07-07 15:42:54 +01:00
Jorik Schellekens
0d6e7759d0
Fix review details
...
- spelling mistake
- unwatch watched setting
- lint (indentation)
- use more performant component
2020-07-07 15:11:08 +01:00
Jorik Schellekens
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
Michael Telatynski
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
Bruno Windels
92a2621815
also apply sticky header bg color when backdrop-filter is not supported
2020-07-07 13:22:13 +02: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
df072a12b2
room settings icons
2020-07-07 12:30:02 +02:00
Bruno Windels
1ef73958f3
change hide community icon in context menu
2020-07-07 12:16:31 +02:00
Bruno Windels
38ff58f8dd
remove upload icon
2020-07-07 12:16:16 +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
Jorik Schellekens
5176685d20
Implement incoming call box
2020-07-06 23:05:00 +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
3e5664de7b
update user menu icons
2020-07-06 16:12:36 +02:00
Bruno Windels
5735c6d8f5
update favorite icon
2020-07-06 16:12:17 +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
Michael Telatynski
83cfdd9c07
Fix accessibility of the Explore button
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-05 01:30:22 +01: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
Michael Telatynski
ae5ab4c394
Merge pull request #4893 from matrix-org/t3chguy/room-list/101
...
Radio button outline fixes including for new room list context menu
2020-07-03 20:35:17 +01:00
Michael Telatynski
af5f9b7c41
revert dark mode separator colour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:53:06 +01:00
Michael Telatynski
c8bb6f5904
Improve radio outlines for message layout to be more consistent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:48:22 +01:00
Michael Telatynski
5a542281ed
Make Styled Radio Button outlines default-off
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:27:45 +01:00
Bruno Windels
bec10b79da
apply some of the new icons
2020-07-03 18:03:47 +02:00
Bruno Windels
262b1edaa3
new icons
2020-07-03 18:03:28 +02:00
Bruno Windels
918d091878
make background image not move too much when resizing left panel
2020-07-03 16:56:10 +02:00
Bruno Windels
82ca98cdd5
clear background on show more button in element theme
2020-07-03 16:53:06 +02:00
Bruno Windels
b370e3f078
don't need to set width with javascript?
2020-07-03 16:52:01 +02:00
Bruno Windels
82e0816d86
also blur the sticky headers
...
added a DOM element so we can set the background on the parent and
the blur on the new element
2020-07-03 16:50:01 +02:00
Michael Telatynski
9cf162e267
Merge branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6
...
Conflicts:
src/components/views/rooms/RoomSublist2.tsx
src/components/views/rooms/RoomTile2.tsx
2020-07-03 00:02:37 +01:00
Michael Telatynski
289f40ce29
First step towards a11y in the new room list
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 22:21:10 +01:00
Travis Ralston
df05273225
Merge remote-tracking branch 'origin/joriks/room-list-tooltips' into develop
2020-07-02 15:20:27 -06:00