mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 07:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
39321 commits 219 branches 562 tags 474 MiB
Commit graph

455 commits

Author SHA1 Message Date
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:15:04 +02:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
David Baker
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox 
Fix bug where 'other homeserver' would unfocus
 2021-07-19 10:09:03 +01:00
Šimon Brandner
96acd6c9ef
Cleanup _ReplyThread.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:06:31 +02:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
David Baker
f9b45677d6 Fix bug where 'other homeserver' would unfocus 
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.

Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
 2021-07-16 22:27:31 +01:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02:00
Šimon Brandner
18ba7a280d
Give sources a little padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:30:50 +02:00
Šimon Brandner
31f5d012b8
Improve the look and feel of the picker 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:16:07 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 19:37:57 +02:00
Šimon Brandner
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 14:54:06 +02:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
 2021-07-15 10:04:48 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Šimon Brandner
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 16:53:05 +02:00
Šimon Brandner
6a285bed5a
Make the buttons easier to hit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:06:41 +02:00
Šimon Brandner
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-13 13:21:27 +02:00
Travis Ralston
3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Germain Souquet
16dc3c47e1 Make ghost button background transparent 2021-07-08 10:37:40 +02:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:53:22 +02:00
Michael Telatynski
82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Šimon Brandner
ffc6f96d45
Remove explicitly set font-family 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:12:45 +02:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Šimon Brandner
c5ee2a6b32
Add share button and refoctor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 13:43:42 +02:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02:00
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Robin Townsend
17edfec3aa Make it easier to pan images in the lightbox 
Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:08:44 -04:00
Šimon Brandner
2a22f03a6a
Support InfoTooltip kinds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:40:27 +02:00
Robin Townsend
555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend
74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
 2021-05-06 13:06:50 +01:00
Michael Telatynski
81b97590f6 fix styling of the disabled danger_outline button 2021-05-05 16:51:46 +01:00
Michael Telatynski
acce9a4548 Fix rounded progress bars 2021-05-05 11:50:55 +01:00
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Robin Townsend
3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend
d3db5fe77f Vectorize mini avatar uploader spinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:09 -04:00
Šimon Brandner
dad7a22055
Initial code for dynamic minZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:03:39 +02:00
Michael Telatynski
ca07b1ed04
Update res/css/views/elements/_FacePile.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-04-22 09:06:53 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Tulir Asokan
b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view 
Improve image view
 2021-04-13 19:01:27 -06:00
RiotRobot
8af81ea90f Revert "Change to inset" 
Safari doesn't support `inset`.

This reverts commit b3706b682e.
 2021-04-12 14:37:11 +01:00
J. Ryan Stinnett
19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
650421eefb Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 13:56:09 +01:00
Šimon Brandner
7f496c7bf5
Add comment: same on all themes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:04:07 +02:00
Šimon Brandner
12a36d1a30
This is hopefully not true anymore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:44:40 +02:00
Šimon Brandner
535ae086b4
Make sender bold 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:31:42 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
Tulir Asokan
c31967dc97 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-26 21:31:28 +02:00
Michael Telatynski
4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
Michael Telatynski
09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Šimon Brandner
c96d2621a0
Set max-width and MIN_ZOOM 
This might have some side effects but as far as I can tell they shouldn't be too problematic

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 19:57:14 +01:00
Šimon Brandner
8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 20:37:39 +01:00
Šimon Brandner
9c313854d0
Increase defautl size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:23:40 +01:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-14 08:30:28 +01:00
Tulir Asokan
8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Michael Telatynski
081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 
Rebuild space previews with new designs
 2021-03-11 14:06:31 +00:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login 
Rework cross-signing login flow
 2021-03-11 12:53:55 +00:00
Michael Telatynski
6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Matthew Hodgson
72f28240aa fix AccessibleButton layout some more 2021-03-08 23:28:54 +00:00
Matthew Hodgson
c543f0a2d0 fix AccessibleButton label positioning now they can wrap 2021-03-08 22:29:08 +00:00
Matthew Hodgson
b3cd6fcc9b vertically align labels in AccessibleButtons if their height is pushed out by wrapped text elsewhere 2021-03-08 17:59:02 +00:00
Travis Ralston
757597e55f Fixed review concerns 2021-03-05 16:29:14 -07:00
Travis Ralston
711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
Šimon Brandner
1955fff08c
CSS cleanup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:50:50 +01:00
Šimon Brandner
dc283241aa
Remove wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:28:42 +01:00
Šimon Brandner
273753a42a
Fix hex formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:25:34 +01:00
Šimon Brandner
5a9e1a1482
Fix close icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:10:54 +01:00
Šimon Brandner
d58c17ff3b
Show grabbing cursor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 07:50:53 +01:00
Šimon Brandner
25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner
983895289c
Update info 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 20:04:25 +01:00
Šimon Brandner
81698a2714
Fix pointer-events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 19:31:19 +01:00
Šimon Brandner
83e1a7a707
Add more button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 18:13:12 +01:00
Šimon Brandner
a6bb203a4b
Redo icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:43:33 +01:00
Šimon Brandner
fafb8d43a3
Fix padding according to the design 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:16:58 +01:00
Šimon Brandner
6aac8f1735
Change padding a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:20:28 +01:00
Šimon Brandner
899ce1f605
Partially fix overflow issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:15:59 +01:00
Šimon Brandner
ab79deb88f
Update the looks a bit more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 08:11:53 +01:00
Šimon Brandner
768d268189
Fix css 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 07:54:36 +01:00
Robin Townsend
40b684d7de Vectorize spinners 
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-23 20:22:09 -05:00
Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Tulir Asokan
dfcf701449 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-02-19 21:47:10 +02:00
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
Michael Telatynski
0e94d08d9a Update SSO Twitter social branding to match guidelines 2021-02-02 17:29:19 +00:00
Michael Telatynski
1ba0999915 Update SSO Facebook social branding to match guidelines 2021-02-02 17:19:18 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Ayush Kumar
6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30
Ayush Kumar
512ac5ef3b fixed invisible text after logging out in the dark theme 2021-01-29 03:58:05 +05:30
Michael Telatynski
34ae766893 Wire up MSC2858 brand attribute 
For better brand adherance.
Also removes old support for https IdP icons.
 2021-01-27 16:15:47 +00:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 08:12:32 +01:00
Michael Telatynski
928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00