Commit Graph

2125 Commits (ae65ed5c2ecf56e719fd24414832891f5b58d48b)

Author SHA1 Message Date
Michael Telatynski ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
2020-08-20 10:26:35 +01:00
Michael Telatynski 8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
Michael Telatynski 24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466
Room List filtering visual tweaks
2020-08-18 17:22:05 +01:00
Bruno Windels 5c6a36f89a
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay
Make reply preview not an overlay so you can see new messages
2020-08-18 11:48:41 +00:00
Michael Telatynski b6dd856649
Merge pull request #5118 from matrix-org/t3chguy/room-list/14617.2
Room List styling tweaks
2020-08-18 12:44:09 +01:00
Bruno Windels 5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Michael Telatynski 24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Michael Telatynski 3fe6f0a792 delint css 2020-08-17 18:26:42 +01:00
Michael Telatynski e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski a4d11cc190 Change highlighting around the room list filter 2020-08-17 16:59:29 +01:00
Michael Telatynski b9f22aa569 Merge branch 't3chguy/room-list/14617.2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466 2020-08-17 15:32:45 +01:00
Michael Telatynski 6e2a26443d Fix corner rounding on images not always affecting right side 2020-08-17 10:55:54 +01:00
Michael Telatynski 21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski 4381bdfdbf fix typo 2020-08-14 18:53:56 +01:00
Michael Telatynski 90d99239bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:10:59 +01:00
Michael Telatynski be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608
Switch out the globe icon and colour it depending on theme
2020-08-14 18:10:29 +01:00
Michael Telatynski d861536487 Make globe transparent 2020-08-14 10:30:54 +01:00
Michael Telatynski 4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski a4847da0c2
Merge pull request #5107 from matrix-org/t3chguy/room-list/community-active-marker
Fix styling for selected community marker
2020-08-13 20:22:35 +01:00
J. Ryan Stinnett 3ece2dd21d Fix action bar safe area regression
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.

Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
2020-08-13 19:24:11 +01:00
Michael Telatynski b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski 4abbcd8c06 Fix styling for selected community marker 2020-08-13 15:24:21 +01:00
Michael Telatynski df75024a21 Switch out the globe icon and colour it depending on theme 2020-08-13 15:16:31 +01:00
Michael Telatynski 8aa50ecb59 Iterate rageshake download styling 2020-08-13 13:08:07 +01:00
Michael Telatynski 3e475bb69c padding the timeline so that its scrollbar has its own space from the resize handle 2020-08-12 16:21:37 +01:00
Jorik Schellekens 0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett 9e429ee669 Remove rebranding toast
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
2020-08-11 14:27:53 +01:00
Michael Telatynski 4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11
Factor out Iconized Context menu for reusability
2020-08-08 11:41:28 +01:00
J. Ryan Stinnett af825b4559 Fix room list scrolling in Safari
This sets `flex-basis` properly in Safari so the room list is scrollable.

Fixes https://github.com/vector-im/element-web/issues/14877
2020-08-05 14:32:02 +01:00
Michael Telatynski d126f5c1e6 tidy up IconizedContextMenu CSS 2020-08-04 21:42:45 +01:00
Michael Telatynski b30ce0355e Factor out Iconized Context Menu for reusabilit 2020-08-04 21:42:39 +01:00
Jorik Schellekens a61cbc1a11 Add more left padding to fix focus highlight 2020-08-04 15:07:13 +01:00
Jorik Schellekens 271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Bruno Windels fba1158700
Merge pull request #5079 from matrix-org/bwindels/alert-file-panel-empty-state
Add title and icon to empty state of file and notification panel
2020-08-03 12:58:13 +00:00
Bruno Windels 5a3bda7eea Add title and icon to empty state of file and notification panel 2020-08-03 13:30:56 +02:00
J. Ryan Stinnett 71af4580e8 Convert jump to unread button 2020-07-31 20:39:17 +01:00
J. Ryan Stinnett 7aaa4997c2 Convert jump to bottom button 2020-07-31 20:33:15 +01:00
J. Ryan Stinnett f28bce36e1 Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons 2020-07-31 18:23:57 +01:00
J. Ryan Stinnett 5cf86c7573
Merge pull request #5074 from matrix-org/bwindels/center-jump-down-chevron
Center the jump down/up icon, looks misaligned
2020-07-31 18:21:56 +01:00
J. Ryan Stinnett 1a33104877 Use thinner chevron for network, adjust placement 2020-07-31 18:15:51 +01:00
J. Ryan Stinnett 805b8f5299 Add comment on network chevron placement 2020-07-31 18:00:35 +01:00
J. Ryan Stinnett 31180d3df9 Adjust room list colours to match designs 2020-07-31 17:52:19 +01:00
J. Ryan Stinnett 8441763a71 Fix show less icon 2020-07-31 17:48:30 +01:00
Bruno Windels 6b667a93bd also center chevron in top unread button 2020-07-31 14:39:34 +02:00
Bruno Windels 29e17af2f8 scale the icon a bit, as centering changed it's size 2020-07-31 14:30:38 +02:00
Bruno Windels 561b8752b9 actually center the icon 2020-07-31 14:23:24 +02:00
Bruno Windels 01d624fdaf Make the reply preview not an overlay on the timeline anymore
As users can't scroll down all the way down to the timeline like this to
see the last message (and perhaps adjust their reply to it)

This also remove the wrapper div as it is not needed anymore
2020-07-31 13:47:40 +02:00
J. Ryan Stinnett af49639bd8
Merge pull request #5065 from matrix-org/travis/echo/audit
Add local echo for notifications in the new room list
2020-07-31 12:20:20 +01:00
Travis Ralston 5b15d12865 Ensure list visibility changes get counted as list changes
Fixes https://github.com/vector-im/riot-web/issues/14799

We were checking to see if the tags were visible at render time, but we needed to ensure that they were(n't) included when checking for diffs. This introduces a new kind of object cloning for semantic reasons.

This also fixes the selection indicator being a bit off on custom tags.
2020-07-30 14:18:54 -06:00