Commit graph

1249 commits

Author SHA1 Message Date
Michael Telatynski
6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
2019-11-28 16:25:59 +00:00
David Baker
dd7b08ec25
Merge pull request #3674 from matrix-org/dbkr/read_marker_css_transition
Change read markers to use CSS transitions
2019-11-27 09:18:53 +00:00
Matthew Hodgson
bb7cc20b1a fix font smoothing to match figma
as per https://github.com/vector-im/riot-web/issues/11425

with apologies to https://usabilitypost.com/2012/11/05/stop-fixing-font-smoothing/ :/
2019-11-27 00:45:49 +00:00
David Baker
a2e3f64963 Change read markers to use CSS transitions
Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.

Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.

Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine.
2019-11-26 19:06:02 +00:00
Bruno Windels
4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts
Show incoming verification requests in in-app notifications
2019-11-22 16:39:18 +00:00
Bruno Windels
8ce1ed4726 moar lint 2019-11-22 16:36:22 +01:00
Bruno Windels
309633181d use FormButton in verification request tile too and dedupe styles 2019-11-22 16:32:50 +01:00
Bruno Windels
f1c62e7dab make colors slightly more opaque than in design
as it is very light otherwise
2019-11-22 16:04:51 +01:00
Bruno Windels
66cc68bae4 add new-styled button
might merge it later on with accessible button
2019-11-22 16:04:51 +01:00
Bruno Windels
e86d2b616e add ToastContainer 2019-11-22 16:04:51 +01:00
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons
Fix e2e icons
2019-11-21 19:01:17 +00:00
Bruno Windels
f75e45a715 reduce margin on e2e icon in room header 2019-11-21 18:17:55 +01:00
Bruno Windels
854f27df3f remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn 2019-11-21 18:16:10 +01:00
Bruno Windels
cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors 2019-11-21 18:13:01 +01:00
Bruno Windels
3cddcad5de use correct icons with borders 2019-11-21 18:12:32 +01:00
Travis Ralston
6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt
Add an option to disable the use of integration managers for provisioning
2019-11-21 08:10:56 -07:00
Travis Ralston
81c9bdd9f3 It's called an "Integration Manager" (singular)
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
2019-11-20 20:14:25 -07:00
Travis Ralston
3391cc0d90 Add the toggle switch for provisioning 2019-11-20 20:05:32 -07:00
Travis Ralston
b0eb54541c Rip out options to change your integration manager
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
2019-11-20 19:50:13 -07:00
Travis Ralston
66c51704cc Fix indentation 2019-11-20 19:21:10 -07:00
Travis Ralston
fd12eb28e7 Move many widget options to a context menu
Part of https://github.com/vector-im/riot-web/issues/11262
2019-11-20 19:17:42 -07:00
Travis Ralston
e33bfe93b4
Merge pull request #3641 from matrix-org/travis/e2e-icon
Fix positioning, size, and colour of the composer e2e icon
2019-11-20 11:16:54 -07:00
Travis Ralston
f6394b1251 Remove stray colour correction on composer e2e icon
We want it to match the room header
2019-11-20 11:03:53 -07:00
Travis Ralston
93e4de9861 Fix positioning and sizing of e2e icon in the composer
This also removes the special case class for the composer because the input is now aligned regardless of icon.
2019-11-20 11:00:39 -07:00
Matthew Hodgson
758dd4127f upgrade nunito from 3.500 to 3.504
fixes https://github.com/vector-im/riot-web/issues/8092 by way of https://github.com/google/fonts/issues/632
2019-11-20 16:36:27 +00:00
Bruno Windels
f9b5678b06
Merge pull request #3631 from matrix-org/bwindels/userinfo-css-fixes
Fix some styling regressions in member panel
2019-11-19 13:24:06 +00:00
Bruno Windels
5f7b0fef33 scale (new) icons to fit available size
fixes https://github.com/vector-im/riot-web/issues/11399
2019-11-19 12:55:28 +01:00
Bruno Windels
39939de04f remove white background on ! and so it looks better on dark theme 2019-11-19 12:51:46 +01:00
Bruno Windels
de15965c4a improve device list layout 2019-11-19 12:51:37 +01:00
Bruno Windels
92292003c8 make shield on verification request scale correctly
by not overriding `mask-size` using `mask` for `mask-image`
2019-11-19 12:51:02 +01:00
Travis Ralston
6b726a8e13 Implement the bulk of the new widget permission prompt design
Part 1 of https://github.com/vector-im/riot-web/issues/11262

This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).

The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up.
2019-11-15 14:26:16 -07:00
Bruno Windels
0f39a9f72d fix pr feedback 2019-11-15 17:29:38 +01:00
Bruno Windels
d416ba2c0c add verify button while we don't have the verification in right panel 2019-11-15 16:14:18 +01:00
Bruno Windels
ecc842629a fix css lint errors 2019-11-15 16:14:18 +01:00
Bruno Windels
edd5d3c915 make custom power level not grow too wide 2019-11-15 16:14:18 +01:00
Bruno Windels
1162d1ee43 Fix user info scroll container growing larger than available height
making whole room view grow taller than viewport
2019-11-15 16:14:18 +01:00
Bruno Windels
48b1207c6e split up PowerLevelEditor into two components
one while editing (PowerLevelEditor) and one
while not editing (PowerLevelSection).

Also save when pressing the button, not when changing the
power dropdown.

Also show the spinner next to the dropdown when saving,
not at the bottom of the component.
2019-11-15 16:14:18 +01:00
Bruno Windels
6db162a3a7 add PL edit mode, don't show selector by default
still saves when changing the selector though
2019-11-15 16:14:18 +01:00
Bruno Windels
b278531f2f add IconButton as in design 2019-11-15 16:14:18 +01:00
Bruno Windels
942a1c9a56 fix e2e icon in composer having wrong colors 2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc use normal shield for verification requests 2019-11-15 16:14:18 +01:00
Bruno Windels
fe059e524f don't need this, as it takes height from the constrained width 2019-11-15 16:14:18 +01:00
Bruno Windels
030827f77d mark destructive actions in red 2019-11-15 16:14:18 +01:00
Bruno Windels
0bd1e7112d style security section as per design 2019-11-15 16:14:18 +01:00
Bruno Windels
73b6575082 fixup: verified shield should be green 2019-11-15 16:14:18 +01:00
Bruno Windels
0a2255ce73 fixup: bring back margin above display name 2019-11-15 16:14:18 +01:00
Bruno Windels
3e356756aa style profile info 2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9 restyle e2e icons 2019-11-15 16:14:18 +01:00
Bruno Windels
af4ad488bd Restyle Avatar
Make it a circle with the profile picture centered,
with a max height/width of 30vh
2019-11-15 16:14:18 +01:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00