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
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
0cbc506ad6
add missing svg
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:26:50 +01:00
Bruno Windels
ae0bb2a2aa
rename file to mod, for all theme modifications
2020-07-01 15:02:20 +02: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
Michael Telatynski
cbd2a9cd35
Redo Iconized Context Menu styling to match Figma and simplify future a11y work by flattening the DOM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 22:11:12 +01:00
Michael Telatynski
fe4cf9f9b4
Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2
2020-06-30 21:16:37 +01:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
...
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2
...
Implement new design on security setup & login
2020-06-30 17:55:03 +01:00
Michael Telatynski
446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0
...
Fix Room Custom Sounds regression and make ProgressBar relevant again
2020-06-30 16:56:57 +01:00
Bruno Windels
dad47148ae
clear hairlines by making them transparent for now ...
...
also some color changes
2020-06-30 13:28:19 +02:00
Bruno Windels
6fc4be386a
add blurred, blended avatar background to left panel
2020-06-30 13:28:19 +02:00
Bruno Windels
c0a9af945c
use Inter as font
2020-06-30 13:28:19 +02:00
Bruno Windels
baebab7b16
Add element theme
2020-06-30 13:28:19 +02:00
David Baker
1e457994f9
More padding between header & text in radio button
2020-06-30 11:10:12 +01:00
Michael Telatynski
6b2ba8caed
Add svgs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 00:27:32 +01: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
Michael Telatynski
cf3c914382
Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0
2020-06-26 15:35:36 +01:00
David Baker
15ebaa1470
Port recovery key upload button to new designs
2020-06-26 15:22:04 +01:00
Travis Ralston
3abc9d8d56
Merge branch 'develop' into travis/room-list/tag-panel
2020-06-26 07:26:57 -06:00
Travis Ralston
424443927f
Merge pull request #4843 from matrix-org/travis/room-list/user-menu
...
Make the whole user row clickable in the new room list
2020-06-26 07:25:50 -06:00
Michael Telatynski
f830a4b7fc
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 14:22:59 +01:00
Michael Telatynski
72035c8078
Make <ProgressBar /> relevant again
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 14:19:58 +01:00
David Baker
f4460ca78f
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2
2020-06-26 13:12:06 +01:00
David Baker
178cbca934
Use mask images in key entry dialogs
2020-06-26 12:56:41 +01:00
David Baker
e18ea55d20
Convert icons to masks
...
so they're a sensible colour in other themes
2020-06-26 12:41:24 +01:00
David Baker
bf45cb0588
PR feedback: re-order CSS & add underscore
2020-06-26 11:24:07 +01:00
Andrew Morgan
77b618e4f3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into anoa/new_spinner
...
* 'develop' of github.com:matrix-org/matrix-react-sdk:
bandaid
make js-sdk import happy?
ts-ignore because something is made of fail
js-sdk imports suck
Iterate on the new room list resize handle
Welcome no longer needs any props
unexport things which need not exporting
Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
Fix Welcome.html URLs
improve typing
Add account and room-account data hooks
Create a StaticNotificationState for representative purposes
Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
2020-06-26 10:17:26 +01:00
Andrew Morgan
e790a31f09
Include newline at end of _InlineSpinner.scss
2020-06-26 09:44:47 +01:00
Andrew Morgan
a2e33a2386
Prevent old InlineSpinner gif from spinning
2020-06-26 09:41:18 +01:00
Travis Ralston
7ce3cc1db7
Allow the tag panel to be disabled in the new room list
...
Fixes https://github.com/vector-im/riot-web/issues/14156
2020-06-25 20:35:40 -06:00
Travis Ralston
411271422c
Make the whole UserMenu a button to open the menu
2020-06-25 19:54:17 -06:00
Travis Ralston
bcfdd4d984
Move all of the UserMenu into the UserMenu component
2020-06-25 19:38:11 -06:00
Travis Ralston
dafce40d1b
Rename UserMenuButton to UserMenu for new scope
2020-06-25 19:29:12 -06:00
Andrew Morgan
87f961df3f
Put behind a labs flag
2020-06-26 01:22:46 +01:00
Andrew Morgan
6ea5dc7b7c
Change the look of the spinner
2020-06-26 01:19:38 +01: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
7b79dd6be1
Make the sign out button red
2020-06-25 15:13:28 -06:00
Travis Ralston
9f5a716cc5
Adjust padding and margins on user menu
2020-06-25 15:11:04 -06:00
Travis Ralston
2b58875c7f
Fix alignment issues with the user menu objects
2020-06-25 15:07:38 -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
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced
...
Move compact modern layout checkbox to 'advanced'
2020-06-25 14:38:18 +01:00
Jorik Schellekens
41c59cc75e
Fix deactivated checked checkbox styling
2020-06-25 14:21:08 +01:00
David Baker
2b144a846a
Apply some of the newer styling to passphrase / recovery key entry
2020-06-25 12:44:15 +01:00
Travis Ralston
291914492f
Fix icons in the new user menu not showing up
2020-06-24 19:20:43 -06:00
Travis Ralston
906b72082e
Merge pull request #4819 from matrix-org/travis/room-list/icon-masks
...
Use theme-capable icons in the user menu
2020-06-24 10:34:29 -06:00
David Baker
966837232c
Add header icons & justification
2020-06-24 16:12:46 +01:00
Jorik Schellekens
0638b94cc2
Move compact checkbox
2020-06-24 16:06:50 +01:00
Bruno Windels
fc61145c11
Merge pull request #4814 from matrix-org/bwindels/custom-theme-font
...
Font support in custom themes
2020-06-24 13:15:42 +00: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
Travis Ralston
3b24f42def
Merge pull request #4818 from matrix-org/travis/room-list/user-menu-polish
...
Update profile information in User Menu and truncate where needed
2020-06-24 07:04:49 -06:00
Travis Ralston
256636ccf8
Use display:block over absolute positioning
2020-06-24 07:04:19 -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
Travis Ralston
5c7e59b132
Use theme-capable icons in the user menu
...
They're still inconsistent weights, but at least they are the right color on non-light-theme clients.
2020-06-23 21:17:39 -06:00
Travis Ralston
380aed4244
Update profile information in User Menu
...
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.
This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
2020-06-23 21:01:50 -06: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
Bruno Windels
e083856801
allow changing the font-family
2020-06-23 17:53:40 +02:00
David Baker
0694776b25
Update the 'save your security key' screen
2020-06-23 16:27:41 +01:00
Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced
...
Custom font selection
2020-06-23 15:38:50 +01:00
David Baker
6ce8584337
Implement first screen (recovery key / passphrase choice)
2020-06-23 15:04:39 +01: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
Jorik Schellekens
d54676aefe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced
2020-06-22 15:35:48 +01:00
Jorik Schellekens
aab42a291b
implement appearance tab nits
...
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
2020-06-22 12:28:15 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced
2020-06-22 11:27:48 +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
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview
2020-06-18 15:19:28 +01:00
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced
2020-06-18 14:41:28 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases"
2020-06-18 09:35:11 +01:00
Michael Telatynski
13a25f37a9
Merge pull request #4778 from matrix-org/t3chguy/notifications0
...
Fix Styled Checkbox and Radio Button disabled state
2020-06-17 17:39:47 +01:00
Travis Ralston
58671f014b
Merge pull request #4765 from matrix-org/travis/room-list/show-less
...
Add a 'show less' button to the new room list
2020-06-17 10:24:50 -06:00
Travis Ralston
d2831ffb0c
Merge pull request #4758 from matrix-org/travis/room-list/sticky
...
Sticky and collapsing headers for new room list
2020-06-17 08:28:38 -06:00
Travis Ralston
63447413ca
Replace class block with reference to class
2020-06-17 08:28:22 -06:00
J. Ryan Stinnett
a816f494e4
Merge pull request #4656 from TitanNano/9814
...
Add some media queries to improve UI on mobile (#3991 )
2020-06-17 14:50:16 +01:00
Michael Telatynski
26e763d135
Fix Styled Checkbox and Radio Button disabled state
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-17 14:26:22 +01:00
Travis Ralston
aab7e0cc14
Fix alignment of checkboxes in new room list's context menu
...
At somepoint the checkbox lost its padding, so we don't need to counteract it.
2020-06-16 18:56:56 -06:00
Jovan Gerodetti
af1c2f9b29
fix requested changes from #3991
...
Signed-off-by: Jovan Gerodetti <jovan.gerodetti@titannano.de>
2020-06-16 23:11:32 +02:00
Dale Harvey
049e3fc08c
Add some media queries to improve UI on mobile
2020-06-16 23:11:32 +02:00
Travis Ralston
e4a51a7c01
Add presence icons; Convert to generic icon component
...
For https://github.com/vector-im/riot-web/issues/14039
2020-06-16 14:44:37 -06:00
Travis Ralston
bcebef7e56
Add a globe icon to public rooms
...
For https://github.com/vector-im/riot-web/issues/14039
2020-06-16 12:13:12 -06:00
Jorik Schellekens
a250bf6a97
Fix whitespace
2020-06-16 18:08:49 +01:00
Jorik Schellekens
2d6077f2c8
Fix radio circle color
2020-06-16 18:02:34 +01:00
Jorik Schellekens
2192332968
Add layout options to the appearance tab
2020-06-16 17:55:19 +01:00
Jorik Schellekens
17dbb1ac8b
Message preview for font slider
2020-06-16 15:41:10 +01:00
Travis Ralston
84e60ee439
Add a 'show less' button to the new room list
2020-06-15 20:00:09 -06:00
Travis Ralston
4186070489
Support list collapsing and jumping
...
Fixes https://github.com/vector-im/riot-web/issues/14036
2020-06-15 19:47:43 -06:00
Jorik Schellekens
045217ee8d
fix style
2020-06-15 17:46:16 +01:00
Jorik Schellekens
02ccdcb802
Fix field width and add tooltip
2020-06-15 17:42:30 +01:00
Jorik Schellekens
edb6bbc6c0
Implement font selection
2020-06-15 15:33:52 +01:00
Travis Ralston
8596905cee
Merge branch 'develop' into travis/room-list/sticky
2020-06-15 06:54:27 -06:00
Jorik Schellekens
94f52c4ee2
Merge pull request #4731 from matrix-org/joriks/radio-buttons
...
Change theme selector to use new styled radio buttons
2020-06-15 12:51:02 +01:00
Jorik Schellekens
d44fbda834
Make disabled checkbox look more convincingly useless
2020-06-15 12:23:14 +01:00
Jorik Schellekens
3b1f0db3e1
Use smaller top margin for selectors
2020-06-15 12:06:40 +01:00
David Baker
8ebae4c3b6
Merge pull request #4686 from matrix-org/dbkr/recovery_keys_over_passphrases
...
Use recovery keys over passphrases
2020-06-15 11:30:30 +01:00
Travis Ralston
eeac80096c
Float the badges with the sticky headers
2020-06-13 19:07:19 -06:00
Travis Ralston
1bbf2e053b
Initial attempt at sticky headers
...
Docs enclosed in diff.
2020-06-13 11:55:11 -06:00
Travis Ralston
f9a4151a6e
Add rudimentary dark theme support
2020-06-12 13:52:54 -06:00
Travis Ralston
510f98b8b0
Bump width of user menu to account for 16px overlap
2020-06-12 10:29:42 -06:00
Travis Ralston
9eb965878a
Merge pull request #4754 from matrix-org/travis/room-list/per-list-algo
...
Support per-list options and algorithms on the new room list
2020-06-12 08:40:23 -06:00
Travis Ralston
4aa15ee191
Wire up the context menu to the room list store
...
Updates are passed along magically to the sublist, so we don't need to listen for the room list store's response to our changes.
This just hits the functions introduced in the last commit.
2020-06-11 22:04:10 -06:00
Travis Ralston
ec48c76a4f
Merge pull request #4753 from matrix-org/travis/room-list/minimized
...
Add a minimized view to the new room list
2020-06-11 17:20:49 -06:00
Jorik Schellekens
3895c03ee2
Merge pull request #4752 from matrix-org/joriks/irc-encryption-alignment
...
Fix e2e icon alignment in irc-layout
2020-06-11 23:42:49 +01:00
Travis Ralston
484dc36619
Fix alignment of show more button
2020-06-11 14:41:35 -06:00
Travis Ralston
2c04a56784
Add a minimized view to the new room list
...
This covers everything except breadcrumbs, as those are somewhat undecided from a design perspective.
2020-06-11 14:39:28 -06:00
Jorik Schellekens
2617ce5dd5
fix checkbox regression
2020-06-11 12:40:49 +01:00
Jorik Schellekens
cf392af52f
Address design issues and set theme at device level
2020-06-11 12:27:09 +01:00
Jorik Schellekens
872103fb8a
Fix e2e bade alignment
2020-06-11 11:44:11 +01:00
Jorik Schellekens
0f685eb0e9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/radio-buttons
2020-06-11 11:03:54 +01:00
Jorik Schellekens
399dd6a225
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/fix-read-receipts
...
To fix types
2020-06-11 10:55:27 +01:00
Jorik Schellekens
b36d7d48cc
Center read reaceipts on irc-ui
2020-06-11 10:36:52 +01:00
Travis Ralston
1d84b46681
Fix vertical height causing sublists to wrap
2020-06-10 15:22:17 -06:00
Travis Ralston
6c31bf1a61
Fix layout when resizing the list width
2020-06-10 15:15:58 -06:00
Travis Ralston
be366bdd7f
Fix various layout concerns with the new room list
...
It had ~32px of overflow causing a horizontal scrollbar. Turns out the layout engine gets confused when hidden elements are at the end of a flexbox, so we just move them higher in the DOM (where they logically still make sense).
The remaining changes are all alignment and misc changes in that respect, and probably not obvious.
2020-06-10 15:05:17 -06:00
Jorik Schellekens
b2154a4a61
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/fix-read-receipts
2020-06-10 17:33:22 +01:00
Jorik Schellekens
b63d73e3b6
Merge pull request #4729 from matrix-org/joriks/appearance-tab
...
Move Settings flag to ts
2020-06-10 16:57:18 +01:00
Jorik Schellekens
11d85f167b
Fix read-receipt alignment
2020-06-10 15:21:36 +01:00
Travis Ralston
72bb89d4ee
Merge pull request #4743 from matrix-org/travis/room-list/tile-menu
...
Add a context menu to rooms in the new room list
2020-06-10 07:46:09 -06:00
Travis Ralston
58db992382
Add 10px to comment
2020-06-10 07:45:52 -06:00
Travis Ralston
a3391d9a08
Merge branch 'develop' into travis/room-list/hover-state
2020-06-10 07:42:41 -06:00
Travis Ralston
78e1db9d30
Merge pull request #4741 from matrix-org/travis/room-list/resize-handle
...
Update resize handle for new designs in new room list
2020-06-10 07:40:34 -06:00
Travis Ralston
95b4abba3b
Merge pull request #4735 from matrix-org/travis/room-list/breadcrumbs
...
Reimplement breadcrumbs for new room list
2020-06-10 07:39:55 -06:00
Travis Ralston
60b5f2dbec
Merge pull request #4744 from matrix-org/joriks/radio-buttons-isolated
...
Add styled radio buttons
2020-06-10 07:27:17 -06:00
Jorik Schellekens
ab47e0ed24
lint lines
2020-06-10 13:49:03 +01:00
Jorik Schellekens
a2294a73a4
Make checkboxes a11y friendly
2020-06-10 13:41:34 +01:00
Jorik Schellekens
70fe7ce619
fix licensing info
2020-06-10 13:39:28 +01:00
Jorik Schellekens
8fc6289290
Use appearance instad of display for accessibility
2020-06-10 13:37:09 +01:00
Jorik Schellekens
3bea64e950
smaller margin
2020-06-10 13:06:17 +01:00
Jorik Schellekens
0fb6846c9d
Radio buttons
2020-06-10 13:03:00 +01:00
Travis Ralston
175fc0e2a1
Appease the style linter
2020-06-09 23:13:57 -06:00