OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
29,844 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

796 Commits (0b3c7e0972f8ccb32f73be4eca6baa745540ed2b)

Author SHA1 Message Date
Travis Ralston 2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Jorik Schellekens 58532f2ac4
Merge pull request #4990 from matrix-org/joriks/irc-layout-truncate-upload-name 
ellipse senders for images and videos
 2020-07-17 22:04:19 +01:00
Travis Ralston 3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Michael Telatynski 9ec2ca447c Update style of default tooltips to match the new style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:19:10 +01:00
Michael Telatynski a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage 
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
 2020-07-16 15:47:12 +01:00
Michael Telatynski e6dff951b8 Fix composer text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:42:58 +01:00
Michael Telatynski 1a9680b527 Update font size of member filter field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:40:31 +01:00
Michael Telatynski 576294e7ce Add shadow to the reply preview and autocomplete composer panes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:26:25 +01:00
Michael Telatynski a2b5e5a6a1 Fix top right header button layout and hover consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:46 +01:00
Michael Telatynski cb4f4c96b4 Update colour of typing indicator in timeline to match topic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:23 +01:00
Michael Telatynski 2b260a69a0 Change colour of unread count dot to primary fg 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:37:41 +01:00
Jorik Schellekens 2e8285590c
Merge pull request #4992 from matrix-org/joriks/irc-layout-e2e-icon 
Move e2e icon
 2020-07-16 14:35:08 +01:00
Jorik Schellekens 96f0681c2e Move e2e icon 2020-07-16 03:52:35 +01:00
Jorik Schellekens bcbb3e8169 fix name jump 2020-07-16 03:14:20 +01:00
Jorik Schellekens e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Travis Ralston 17dba01993 Fix style lint 2020-07-15 03:49:59 -06:00
Bruno Windels 2da7d17a5d change color of who is typing text to composer icons color 
as requested by Nad
 2020-07-14 20:45:14 +02:00
Bruno Windels aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Bruno Windels 7ff3e6a26d bring back padding between show more and resize handle 2020-07-14 15:09:53 +02:00
Bruno Windels 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
Bruno Windels 4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski fcf5fc0990 Fix normal e2e icon colour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 13:30:05 +01:00
J. Ryan Stinnett 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
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 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
Nad Chishtie ce365cc5a1 Optically align room header height with panel heights 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 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
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
Michael Telatynski 6a58512397 Fix alignments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:45:48 +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 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
Bruno Windels c346122adf align room header with user menu button 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
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 2bf2a08e7a Mark safari hacks 2020-07-10 08:52:46 -06:00
J. Ryan Stinnett ab51dd28dc Merge remote-tracking branch 'origin/develop' into element 2020-07-10 11:08:33 +01:00
Travis Ralston 75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06: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
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
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
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
Bruno Windels d5747ad6c0 Merge branch 'develop' into element 2020-07-08 18:07:45 +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
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
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 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
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 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
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
Bruno Windels bec10b79da apply some of the new icons 2020-07-03 18:03:47 +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
Travis Ralston 0549ef83db
Merge pull request #4878 from matrix-org/travis/room-list/fix-community-invites 
Fix alignment of avatars on community invites
 2020-07-02 14:39:25 -06:00
Travis Ralston e08512020f Fix a couple badge alignment issues with community invites 2020-07-02 14:05:31 -06:00
Travis Ralston c3ad854868 Fix alignment of avatars on community invites 2020-07-02 13:50:25 -06:00
Travis Ralston 7ea3164507 Fix alignment of dot badges in new room list 2020-07-02 13:39:20 -06:00
Travis Ralston 43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski c259408d71 fix alignment of dot and simplify CSS rules 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 12:35:06 +01:00
Michael Telatynski 992349944a Fix room list 2's room tile wrapping wrongly 2020-07-02 12:18:48 +01:00
Michael Telatynski b5014282a4 Iterate PR based on Figma design and feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 13:59:50 +01:00
Jorik Schellekens 1889ee202b Add tooltips for breadcrumbs 2020-07-01 12:23:27 +01:00
Jorik Schellekens aab372c648 Add tooltips 2020-07-01 01:50:31 +01:00
Jorik Schellekens b1e0b35758 Lint style 2020-06-30 23:40:24 +01:00
Jorik Schellekens dcd51b5be3 Implement breadcrumb notifications and scrolling 2020-06-30 23:24:46 +01:00
Michael Telatynski 198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Bruno Windels 6fc4be386a add blurred, blended avatar background to left panel 2020-06-30 13:28:19 +02:00
Michael Telatynski 54419878fa Add room notifications context menu and non-default indicator to RoomTile2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:16:51 +01:00
Michael Telatynski adf186f568 Fix RoomTile2 Context Menu to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 23:03:44 +01:00
Travis Ralston 175ade8ac4 Merge branch 'develop' into travis/room-list/todo-cleanup 2020-06-28 20:04:41 -06:00
Travis Ralston ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00
Travis Ralston 753f7aa5b8 Remove the DM button from new room tiles 
Fixes https://github.com/vector-im/riot-web/issues/14221
 2020-06-27 22:48:54 -06:00
Travis Ralston 30489ce819
Merge pull request #4840 from matrix-org/travis/room-list/resizer-2 
Iterate on the new room list resize handle
 2020-06-25 16:27:39 -06:00
Travis Ralston 326fa8be7d
Merge pull request #4837 from matrix-org/travis/room-list/hover-states 
Update sublists for new hover states
 2020-06-25 16:05:25 -06:00
Travis Ralston 555078a993 Iterate on the new room list resize handle 
Only show shadow when resizing, increase the hit area, and make the handle show up when the list itself is hovered.
 2020-06-25 16:03:56 -06:00
Travis Ralston 0cb54ed2a4 Align the badge count on non-aux lists with other badges 2020-06-25 15:42:44 -06:00
Travis Ralston aacedfaf13 Remove opacity from sublist header text, increase weight 2020-06-25 15:19:03 -06:00
Travis Ralston 129ff3a6e0 Match line colour from user menu in sublist menu 2020-06-25 15:17:19 -06:00
Travis Ralston 0af1507eed Update sublists for new hover states 
Fixes https://github.com/vector-im/riot-web/issues/14135
Unblocks https://github.com/vector-im/riot-web/issues/14089
 2020-06-25 12:11:10 -06:00
Travis Ralston 5efa5d2c80 Implement new resize handle for dogfooding 
Smaller handle width, small shadow on the top of the show more button if there's more rooms to be shown. The resize handle also only shows when you're hovering in the area now.

The original design called for the shadow to show up only if the user is cutting a tile or dragging, however that is complicated implementation-wise. For speed and encouraging a dogfooding pattern we're going ahead with this behaviour instead.
 2020-06-25 10:08:44 -06:00
Travis Ralston 5e07052f9e
Merge pull request #4816 from matrix-org/travis/room-list/tweak/sublisting 
Decrease margin between new sublists
 2020-06-24 07:05:46 -06:00
Jorik Schellekens c660467c33
Merge pull request #4802 from matrix-org/joriks/fix-reply-messageactionbar 
Fix MessageActionBar in irc layout
 2020-06-24 11:00:08 +01:00
Hubert Chathi 74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
Travis Ralston dd9112a01a Decrease margin between new sublists 
This is an attempt to increase density without adjusting the tiles directly.
 2020-06-23 11:44:40 -06:00
Travis Ralston 894357f7f6 Merge branch 'develop' into travis/room-list/unread-2 2020-06-22 14:16:52 -06:00
Travis Ralston cf92fc37d4 Fix layout of minimized view for new room list 2020-06-22 12:51:53 -06:00
Travis Ralston 30d8dc06fc Increase bold weight for unread rooms 
For https://github.com/vector-im/riot-web/issues/14084
 2020-06-22 10:25:10 -06:00
Jorik Schellekens ea929e575a Fix MessageActionBar 2020-06-22 16:02:23 +01:00
Hubert Chathi c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Jorik Schellekens f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00