mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 23:31:28 +03:00
Code Issues Projects Releases Packages Wiki Activity
29091 commits 217 branches 561 tags 443 MiB
Commit graph

2263 commits

Author SHA1 Message Date
Michael Telatynski
0fe6ce1842 Stage svgs 2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski
89a836100d small css tweaks to closer match the figma 2020-09-08 15:42:31 +01:00
J. Ryan Stinnett
2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01:00
Michael Telatynski
667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
 2020-09-07 14:33:57 +01:00
Nigel Mansell
590e2b70f9 Merge remote-tracking branch 'upstream/develop' into develop 2020-09-05 16:51:13 -04:00
J. Ryan Stinnett
cc2c179a0f Set default text colour for Settings tabs 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
e3f47525e5 Rename backup CSS classes 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers 
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
 2020-09-03 15:41:17 +01:00
Michael Telatynski
243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Nigel Mansell
7550a92df9 Fixed 1px jump upwards on filter room members box 
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
 2020-09-01 13:58:48 -04:00
Travis Ralston
78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston
fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston
02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston
0ffa548864 Change the menu button to a chevron 
by design request
 2020-08-28 15:37:23 -06:00
Travis Ralston
e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Travis Ralston
cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change 
Update create room dialog copy & community prototype home icon
 2020-08-28 09:47:53 -06:00
Travis Ralston
3c176f762e Remove disabled clear button from tag panel + dead code 2020-08-27 14:27:06 -06:00
Travis Ralston
13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Michael Telatynski
bf3c49b8df Remove redundant CSS rules 2020-08-27 10:46:29 +01:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher 
Communities v2 prototype: Tag panel selection changes
 2020-08-26 10:22:50 -06:00
Travis Ralston
82b015bd5f Rename components to match prior convention 2020-08-26 08:52:39 -06:00
Travis Ralston
0c67a42b0f Make padding only on the prototype tag panel 2020-08-26 08:42:26 -06:00
Travis Ralston
20c562c208 Change user avatar to a home icon 2020-08-25 21:46:26 -06:00
Travis Ralston
5ea11e90b2 Appease the style linter 2020-08-25 21:17:35 -06:00
Travis Ralston
56c7f86983 Add an invite users to community step to dialog flow 2020-08-25 21:08:31 -06:00
Travis Ralston
7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Travis Ralston
84d782022f
Merge pull request #5139 from matrix-org/travis/communities/room-behaviour 
Communities v2 prototype: Explore rooms, global state, and default room
 2020-08-24 07:43:01 -06:00
Michael Telatynski
dc08fee635 Fix the resize handle being unreachable when you don't have permission to add widgets 2020-08-24 14:38:58 +01:00
Michael Telatynski
ef137d2234 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-08-24 11:13:04 +01:00
Travis Ralston
276ed90884 Add a personal group for an all-communities state 
Design is approximate and needs review, though being completed out of band.
 2020-08-21 18:19:29 -06:00
Michael Telatynski
35cc1fb06d small tweaks 2020-08-21 16:38:28 +01:00
Michael Telatynski
cca5ccd79d Switch widget resizing to re-resizable and add persistence 2020-08-21 16:29:07 +01:00
Travis Ralston
c815a370e7 Remove some unused components 
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.

The room tile context menu and top left menu are artifacts of the old room list.

The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
 2020-08-20 20:47:02 -06:00
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
J. Ryan Stinnett
72056128fe Larger chevron for rebrand 2020-07-30 17:41:26 +01:00
J. Ryan Stinnett
a6d5a2f339 Tweak size / position in network dropdown 2020-07-30 17:40:03 +01:00
J. Ryan Stinnett
e917c0d92e Replace all chevrons with a single icon 
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.

Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.

Fixes https://github.com/vector-im/riot-web/issues/14663
 2020-07-30 16:49:46 +01:00
Travis Ralston
e3765ea8c5 Appease the linters 2020-07-29 20:47:32 -06:00
Travis Ralston
c5574219bb Implement dialog for resending local echo transactions 2020-07-29 20:36:04 -06:00
Travis Ralston
14757cacd5 Introduce a concept of "non-urgent" toasts 
This is somewhat expected to be temporary.
 2020-07-29 12:43:35 -06:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Michael Telatynski
2d918a6dfc
Merge pull request #5052 from matrix-org/t3chguy/fix/14501 
Remove poorly contrasted "dark style" heading in Room Preview Bar
 2020-07-28 16:13:43 +01:00
Jorik Schellekens
fb953ade8e Accessibility focus checkboxes and radio boxes 2020-07-28 16:08:25 +01:00
Jorik Schellekens
4f55ef685d
Merge pull request #4989 from matrix-org/joriks/resize-handlebars-2.0 
Fix handlebar interaction
 2020-07-28 14:30:00 +01:00
Jorik Schellekens
9cd232617d Unify composer and room header icons 2020-07-28 13:19:11 +01:00
Jorik Schellekens
447ef63950 Replace old checkboxes 2020-07-27 16:36:31 +01:00
Jorik Schellekens
1a9487f1be Left align display names irc layout 2020-07-27 16:21:44 +01:00
Jorik Schellekens
8460175389 Move actions above tile 2020-07-27 16:21:44 +01:00
Jorik Schellekens
1d6c2b786e File panel spacing and corner rounding 2020-07-27 16:21:41 +01:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Jorik Schellekens
84e3a0954c Fix handle left align 2020-07-27 15:04:09 +01:00
Michael Telatynski
992d7215c7 Remove poorly contrasted "dark style" heading in Room Preview Bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-27 14:59:00 +01:00
Michael Telatynski
60a6b13f4b
Merge pull request #5026 from matrix-org/t3chguy/room-list/14440 
Put low priority xor toggle back in the room list context menu
 2020-07-24 00:02:50 +01:00
Michael Telatynski
b02175793e Use OpenType tabular numbers in timestamps 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-23 14:52:01 +01:00
Travis Ralston
80687e358f Obliterate some flexboxes in the room list 
We don't need columns of divs to equally size themselves, so use easier layout techniques to make the list fit in the container. We have to take a hit with `height:100%`, but the hit is much more insignificant than confusing the layout engine.

The layout engine has a hard time with dynamically-but-statically-sized stuff like `width: 100%; display: flex;`, particularly when it is nested so badly. Overall this should improve performance for the app by not having to re-paint so often.

Fixes https://github.com/vector-im/riot-web/issues/14639
 2020-07-22 16:34:33 -06:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:50:20 +01:00
Travis Ralston
a0b2859436 Support custom tags in the room list again 
Fixes https://github.com/vector-im/riot-web/issues/14091

Design needs work, however this is behind labs anyways. This re-implements the behaviour of the old room list.

The implementation ended up being a lot easier due to early confusion with what the TagOrderStore and TagPanel take care of. Turns out they don't deal with tags, but groups. As such, we don't need to do anything with filtering (though we keep some sanity checks in place for safety), and just have to wire up the CustomRoomTagPanel and CustomRoomTagStore.
 2020-07-20 16:51:16 -06:00
Michael Telatynski
0de6cada57
Merge pull request #5023 from matrix-org/t3chguy/room-list/14644 
Add min-width to floating Jitsi
 2020-07-20 15:24:26 +01:00
Michael Telatynski
ee8d885e70
Merge pull request #5020 from matrix-org/t3chguy/fix/14649 
Update crypto event icon to match rest of app styling
 2020-07-20 15:21:03 +01:00
Michael Telatynski
ce398c0b34
Merge pull request #5019 from matrix-org/t3chguy/fix/14650 
Fix Reactions Row Button vertical misalignment due to forced height
 2020-07-20 15:20:14 +01:00
Michael Telatynski
9e6532e46e
Merge pull request #5016 from matrix-org/t3chguy/tooltips2 
Use mouseleave instead of mouseout for hover events. Fix tooltip flicker
 2020-07-20 15:19:32 +01:00
Michael Telatynski
476c3eb7c8
Merge pull request #5014 from matrix-org/t3chguy/tooltips 
Fix field tooltips
 2020-07-20 15:18:53 +01:00
Michael Telatynski
828cfb7138 Add min-width to floating Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 15:15:21 +01:00
Michael Telatynski
8aceb11992 Fix community right panel button regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:47:06 +01:00
Michael Telatynski
dfed3342b6 Fix white infill and verified/warning icons too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:09:16 +01:00
Michael Telatynski
519ebdb67a Update crypto event icon to match rest of app styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:05:07 +01:00
Travis Ralston
7996013cd5
Merge pull request #5013 from matrix-org/travis/room-list/rm-old 
[BREAKING] Remove the old room list
 2020-07-20 06:46:05 -06:00
Michael Telatynski
80c65b97a8 Fix Reactions Row Button vertical misalignment due to forced height 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 11:17:09 +01:00
Michael Telatynski
e9633b2e3b Use mouseleave instead of mouseout for hover events. Fix tooltip flicker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 12:01:51 +01:00
Michael Telatynski
c980b58c69 Fix field tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 11:36:23 +01:00
Travis Ralston
361d524e7e Rename remaining SCSS variables to remove 2 suffix 2020-07-17 16:18:15 -06:00
Travis Ralston
0e054c05c2 Remove unused SCSS variables + fix tertiary colour 2020-07-17 16:15:14 -06:00
Travis Ralston
40e4347114 Replace $roomtile-badge-fg-color with $accent-fg-color 2020-07-17 16:08:47 -06:00
Travis Ralston
1cecabb0b3 Replace $roomtile-name-color with $muted-fg-color (equivalent) 2020-07-17 16:03:26 -06:00
Travis Ralston
a30da8dcdb Rename RoomList2 SCSS variables 2020-07-17 15:59:35 -06:00
Travis Ralston
c5d732a631 IncomingCallBox2 -> IncomingCallBox 2020-07-17 15:56:58 -06:00
Travis Ralston
7f5c501b2b CallView2 -> CallView 2020-07-17 15:55:30 -06:00
Travis Ralston
cbf967ea69 Remove legacy call components 2020-07-17 15:53:13 -06:00
Travis Ralston
d7ada5f7c5 Remove TODO flags 2020-07-17 15:47:37 -06:00
Travis Ralston
c9b0b3b31d RoomSublist2 -> RoomSublist 2020-07-17 15:46:46 -06:00
Travis Ralston
96065ae982 RoomTile2 -> RoomTile 2020-07-17 15:43:29 -06:00
Travis Ralston
8dfe7b6cc7 RoomBreadcrumbs2 -> RoomBreadcrumbs 2020-07-17 15:32:06 -06:00
Travis Ralston
a7c18bfbfa RoomList2 -> RoomList 2020-07-17 15:27:49 -06:00
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
38dc3c8bd1 Replace non-functional Interactive Tooltip 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:43:42 +01: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
Jorik Schellekens
173ccbcec9 Fix handles 2020-07-16 16:21:38 +01:00
Michael Telatynski
5e6f8b20bc Visual WIP 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 16:16:41 +01:00
Jorik Schellekens
d794e17d4d Fix handlebar interaction 2020-07-16 16:16:41 +01:00
Michael Telatynski
fb222c7eff
Merge pull request #5001 from swapnilraj/swapnilraj/country-code-width 
Increase width for country code dropdown
 2020-07-16 16:09:43 +01:00
Swapnil Raj
8253756276 Remove unnecessary import 2020-07-16 20:28:19 +05:30
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
ebb9c4e814 Update text input placeholder active colour to 75% inactive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:46:06 +01:00
Swapnil Raj
0ddfd9ee8c Use rem to guard against font scaling breakages 2020-07-16 20:15:28 +05:30