Commit graph

3702 commits

Author SHA1 Message Date
Michael Telatynski
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
Michael Telatynski
8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
Šimon Brandner
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:17:34 +02:00
Šimon Brandner
722c360de0
Use the correct color for silence button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:42:05 +02:00
Michael Telatynski
1c2bdf3cf4 delint 2021-07-08 13:35:26 +01:00
Šimon Brandner
2615ea7f3f
Add icons to buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
Michael Telatynski
00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Šimon Brandner
9ec3d93402
Better handling of call types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
Michael Telatynski
1cdae54880 Fix text wrapping for Link Preview Widget 2021-07-08 13:16:58 +01:00
Šimon Brandner
6f1fc3fc7e
Fix call button spacing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:43:59 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Šimon Brandner
6ef7ecbe08
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-08 13:22:56 +02:00
Germain Souquet
16dc3c47e1 Make ghost button background transparent 2021-07-08 10:37:40 +02:00
Michael Telatynski
b9a539eaa2 Improve URL Previews
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet
6a03ab825f Fix style linting 2021-07-07 13:15:25 +02:00
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Germain Souquet
870857f321 Right hand side border radius 2021-07-07 13:00:31 +02:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet
b0a1fc7b97 Updated color scheme and spacing 2021-07-07 11:23:38 +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
Šimon Brandner
b5bad0cc23
Add comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:28:29 +02:00
Šimon Brandner
2cd2015e36
Use atom-one-light for light theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:24:59 +02:00
Šimon Brandner
f8307a92d8
Use atom-one-dark for dark theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:24:48 +02:00
Šimon Brandner
9d12439ee7
Give codeblocks a background color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:56 +02:00
Šimon Brandner
8c1721fc35
Remove the old codeblock code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:50 +02:00
Michael Telatynski
eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Germain Souquet
de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
Germain
1b95762910
Merge pull request #6310 from matrix-org/gsouquet/faster-animations 2021-07-05 12:21:49 +01:00
David Baker
0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Germain Souquet
df64a076d9 Deprecate unused PulsedAvatar 2021-07-02 15:24:30 +01:00
Germain Souquet
a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet
a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Germain Souquet
aac0989005 Make beta dot animation run on the compositor 2021-07-02 14:58:59 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Šimon Brandner
0d8f84c769
Delete lozenge effect
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:35:52 +02:00
Šimon Brandner
e582b1559b
Fix redacted messages (again)
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:09:02 +02:00
Šimon Brandner
0fe10e4502
Fix replies to deleted messages
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:22:46 +02: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
Michael Telatynski
1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker
5e3c8fae5c put this just on the buttons 2021-07-01 15:22:44 +01:00
Germain Souquet
d90d1ca8db event list summary alignment in bubble layout 2021-07-01 14:56:34 +01:00
David Baker
66d95ed7b2 Fix button styling in verification bubbles 2021-07-01 14:51:20 +01:00
Germain Souquet
223b40c9d6 Add dark theme support 2021-07-01 14:23:00 +01:00
Travis Ralston
da8a783ca0 lint 2021-06-30 14:51:18 -06:00
Travis Ralston
12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
Germain Souquet
209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Germain Souquet
d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Germain Souquet
4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Travis Ralston
d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf
Improve audio recording performance
2021-06-28 20:49:21 -06:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
Michael Telatynski
494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731 2021-06-28 16:08:12 +01:00
Michael Telatynski
56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Šimon Brandner
43732e5c12
Inherit font-family
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 20:53:14 +02:00
Šimon Brandner
ed78bd9096
Remove explicitly set font-family in place where comments talk about FF
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:12:51 +02: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
Šimon Brandner
fbe3eb7726
Remove unused class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:00:42 +02:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
2e940b7763
Update res/css/structures/_RoomStatusBar.scss
Co-authored-by: Germain <germain@souquet.com>
2021-06-25 14:47:17 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Michael Telatynski
b371abe556
Merge pull request #6266 from matrix-org/t3chguy/fix/17768
Fix space avatar management layout being broken
2021-06-25 11:58:41 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237)
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
Michael Telatynski
620e14eb4b Fix space avatar management layout being broken 2021-06-25 11:10:37 +01:00
Travis Ralston
7a6ee7d918 I know how CSS works. 2021-06-25 00:22:05 -06:00
Travis Ralston
e0a73a583e Increase clickable area of seek bar 2021-06-25 00:19:57 -06:00
Travis Ralston
dd53c25706 Fix right panel sizing 2021-06-24 20:37:34 -06:00
Travis Ralston
ebb6f1b602 Add seeking and notes about clock desync 2021-06-24 20:18:50 -06:00
Michael Weimann
086042f078
update message context texts and icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
Michael Weimann
6ea79b297f
tweak message context icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
Michael Weimann
8f6904ec1b
tweak the message menu cancel icon size
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
Michael Weimann
74f61795eb
add _MessageContextMenu.scss license header
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
Michael Weimann
62efea7e19
add message context menu icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
Michael Weimann
e4eeafd485
migrate the message context menu to IconizedContextMenu
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:49 +02:00
Travis Ralston
9c752680ba Tile styling and early behaviour 2021-06-24 13:56:11 -06:00
Travis Ralston
ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston
8ce77e618f Reduce pointless CSS vars by 2 2021-06-24 11:38:35 -06:00
Travis Ralston
470778cbb8 Move voice message components to audio-generic directory 2021-06-24 11:38:35 -06:00
Travis Ralston
9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Michael Telatynski
6d3e7730ef Fix two PRs duplicating the css attribute 2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051 2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Germain Souquet
09c22c37ff Add comment to specify variable origin 2021-06-24 10:01:44 +01:00
Šimon Brandner
0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 10:57:09 +02:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Šimon Brandner
8d47ea63c2
Make pinned message text clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:41:55 +02:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Michael Telatynski
47be728eb2 Fix invite dialog being cut off when it has limited results 2021-06-24 09:21:52 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox
then fix sizing and alignment of consumers
2021-06-23 12:30:23 +01:00
David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
Michael Telatynski
1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
 Conflicts:
	src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Germain Souquet
27d255f30e Reduce audio waveform layout trashing 2021-06-22 12:27:54 +01:00
Šimon Brandner
202cb0f5d8
Fix styling of buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 17:05:36 +02:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Šimon Brandner
b3ac0c71e1
Fix access token copy button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 12:17:51 +02:00
Šimon Brandner
401fe1d05b
Add call silencing to CallEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:09 +02:00
Šimon Brandner
21a960acc7
Fix timestamp issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 17:53:00 +02:00
Šimon Brandner
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648 2021-06-19 17:24:30 +02:00
Tulir Asokan
c1bc4b0027 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-19 16:11:53 +03:00
Germain Souquet
6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Šimon Brandner
6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-18 19:02:56 +02:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Šimon Brandner
707ecd8786
Don't highlight bubble events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:03:48 +02:00
Šimon Brandner
62de75ab00
Increase height
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:19:57 +02:00
Šimon Brandner
9b6195317e
Improve padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:14:54 +02:00
Šimon Brandner
88ba24f362
Fix bugs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:34:58 +02:00
Šimon Brandner
a781d6f128
Adjust padding and line-height a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:13:52 +02:00
Šimon Brandner
512c054656
Add call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:55:18 +02:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Šimon Brandner
02e6559330
Set text color to secondary-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:04:56 +02:00
Šimon Brandner
7b6c3aec63
Change some styling to better match the designs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 16:33:00 +02:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Šimon Brandner
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Šimon Brandner
dbdb61c820
Improve the mxid overlap situation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-16 17:21:29 +02:00
Michael Telatynski
384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Šimon Brandner
5dc87869eb
Also override mx_SenderProfile_mxid
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 17:22:47 +02:00
Tulir Asokan
cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Michael Telatynski
660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
2021-06-15 12:58:29 +01:00
Michael Telatynski
83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-06-15 12:24:26 +01:00
Šimon Brandner
d08495bde6
Fix display name overlap
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 06:30:22 +02:00
Michael Telatynski
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Michael Telatynski
f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski
66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	yarn.lock
2021-06-14 21:39:06 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Šimon Brandner
60ab7aaed5
Support hiding sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:20:13 +02:00
Šimon Brandner
65c477f45f
Add sidebar icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:17:00 +02:00
Šimon Brandner
9a67851479
Hide feeds with muted video in certain cases and fix colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 14:01:09 +02:00
Šimon Brandner
6ae1f533e9
Add min-width
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 13:50:25 +02: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
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-06-12 13:32:49 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
Šimon Brandner
e431f41e11
Fix feeds misbehaving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 10:48:32 +02:00
Šimon Brandner
97b976b171
Adjust for sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:15:26 +02:00
Šimon Brandner
5608e92885
Add styling for CallViewSidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:51 +02:00
Šimon Brandner
5343be7814
Fix buggy hovering/selecting of event tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
Šimon Brandner
8174973cfe
Use the same styling as for mx_TextualEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +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
Germain Souquet
15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +01:00
Šimon Brandner
fccd71f82e
Update styling based on review
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 06:23:51 +02:00
Michael Telatynski
f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski
90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Šimon Brandner
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
Robin Townsend
372f24ff99 Hide download links from forward dialog preview
since trying to interact with them is pointless.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:19:14 -04:00
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
J. Ryan Stinnett
a895b083a2 Fix notif panel timestamp padding
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.

Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:21:53 +01:00
Michael Telatynski
6d2a7390d7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-07 14:15:49 +01:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Michael Telatynski
8c34a8461e Add way to specify address during public space creation 2021-06-07 08:57:39 +01:00
Robin Townsend
ea2120bdfd Fix timestamps
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Robin Townsend
e891d18fa2 Add my email to my copyright notices
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04: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
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Michael Telatynski
93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Šimon Brandner
1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 08:19:29 +02:00
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Michael Telatynski
0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event
Fix mx_Event containment rules and empty read avatar row
2021-06-03 16:38:55 +01:00
Germain Souquet
5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Michael Telatynski
f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-06-03 16:22:59 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Germain
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment
Add CSS containment rules for shorter reflow operations
2021-06-03 08:10:29 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski
da13ec16f3 Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 2021-06-02 12:42:55 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius
Tweak event border radius to match action bar
2021-06-02 11:39:54 +01:00
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
2021-06-02 10:25:29 +01:00
Šimon Brandner
466a52e238
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-02 10:45:35 +02:00
Robin Townsend
8efbdd0406 Match forward dialog send failed indicator color with button
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-01 17:56:46 -04:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Šimon Brandner
70a5715b3d
Support hangup reasons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:46:41 +02: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
Šimon Brandner
3a0b6eb466
Add a warning icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:40:08 +02:00
Germain Souquet
ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Šimon Brandner
0785997983
Handle missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:28:45 +02:00
Šimon Brandner
86402e9788
Add some styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:03:23 +02:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner
5e4a10ab84
Reorganize HTML
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 07:55:55 +02:00
Šimon Brandner
f94230c292
Fix css
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
5e8df03724
Fix styling a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc
Hook up TimelineCallEventStore and add Avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
3ac63b03a6
Use styling for CallEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
cd67d50a85
Add basic CallEvent styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Germain Souquet
18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00
Michael Telatynski
caaef63077 delint1 2021-05-28 13:11:48 +01:00
Michael Telatynski
36e43270ca
Apply suggestions from code review 2021-05-28 13:08:05 +01:00
Michael Telatynski
e41645795c Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-05-28 13:05:41 +01:00
Nique Woodhouse
ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +01:00
Michael Telatynski
2c750fcb7a Fix overflow issue in suggestion tiles 2021-05-28 12:48:12 +01:00
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski
f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +01:00
Germain Souquet
aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Michael Telatynski
54d8953024 delint 2021-05-26 14:00:53 +01:00
Michael Telatynski
27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet
36dddea338 remove CSS out of sync comment 2021-05-25 14:57:07 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
J. Ryan Stinnett
45678de9a1 Stop overscroll in Firefox Nightly for macOS
Firefox is working on an overscroll feature for macOS, similar to the one Safari
has had for some time now. It doesn't really make sense in an application
context, so this disables it.
2021-05-25 11:29:59 +01:00
Robin Townsend
400917623c Make myself the copyright holder for forward dialog code
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
Nique Woodhouse
153d0ae66d
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui
Improve styling of the message action bar
2021-05-24 13:30:27 +01:00
Robin Townsend
88e0e9b9fb Merge branch 'develop' into improved-forwarding-ui 2021-05-24 08:23:07 -04:00
Germain Souquet
ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Šimon Brandner
c678211a42
Add styling for silencing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:24:20 +02:00
Šimon Brandner
cbc31b43a4
Add icons for silencing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:23:07 +02:00
Michael Telatynski
3f9b6caacd fix missing rounded corners on blurhash placeholder 2021-05-21 21:46:18 +01:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Robin Townsend
332412782e Remove logo spinner
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners
Vectorize spinners
2021-05-20 13:31:35 -06:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Šimon Brandner
340bbeec4f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-20 15:50:49 +02:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Robin Townsend
6cb6c7f3d0 Combine forward dialog room and DM lists
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-19 13:33:48 -04:00
Robin Townsend
83224dc7b6 Ensure forward list room decorations are aligned
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-19 13:32:27 -04:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
abd290938a Fix room name not wrapping in summary card 2021-05-19 17:12:25 +01:00
Nique Woodhouse
8d072cedff Update _MessageActionBar.scss
Correct error on css hover for message action button background colour change
2021-05-19 12:11:24 +01:00
Nique Woodhouse
5daca41bfb Update _MessageActionBar.scss
Increase size of buttons
2021-05-19 11:17:34 +01:00
Nique Woodhouse
8a3db3b40a Update _MessageActionBar.scss
Refine UI of message action bar to increase usability and focus on bar content.
2021-05-19 10:25:54 +01:00
Šimon Brandner
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Michael Telatynski
f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00
Robin Townsend
e798b36f1d Decorate forward dialog room avatars
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:39:22 -04:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04: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
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276
Decorate room avatars with publicity in add existing to space flow
2021-05-14 11:23:46 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski
bdeb4b3bae
Merge pull request #6037 from matrix-org/niquewoodhouse-room-sublist-button-feedback
Increase hover feedback on room sub list buttons
2021-05-14 10:55:32 +01:00
Nique Woodhouse
486350cba2 Update _RoomSublist.scss 2021-05-14 10:41:32 +01:00
Nique Woodhouse
6acf2543f0 Update _RoomSublist.scss
Fix indentation and remove random spurious blank line
2021-05-14 10:38:37 +01:00
Nique Woodhouse
b71bc88514 Update _RoomSublist.scss
Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list.

Add background color on hover to RoomSublist buttons to provide more visual feedback.
2021-05-14 09:22:40 +01:00
Michael Telatynski
9dd9dafce1
Merge pull request #6022 from matrix-org/t3chguy/fix/16622
Fix shield icon in Untrusted Device Dialog
2021-05-13 19:10:59 +01:00
J. Ryan Stinnett
24d49efe33
Merge pull request #6031 from matrix-org/niquewoodhouse-spaces-beta-img
Update spaces.png
2021-05-13 16:26:16 +01:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Nique Woodhouse
fa17b3b3cb Update spaces.png
Update spaces.png to be a smaller file size.
2021-05-13 15:24:47 +01:00
Michael Telatynski
6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski
76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Michael Telatynski
3af0138e9d Update emoji icons to new style 2021-05-13 10:28:35 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Michael Telatynski
565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski
03bd30d125 Fix colours used for the back button in space create menu 2021-05-12 10:48:06 +01:00
Michael Telatynski
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238
Add feedback mechanism for beta features, namely Spaces
2021-05-11 17:46:21 +01:00
Michael Telatynski
7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Travis Ralston
b1d5dc1194
Merge pull request #5993 from matrix-org/travis/voicemessages/scale
Scale voice message clock with user's font size
2021-05-11 10:25:36 -06:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Michael Telatynski
df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179
 Conflicts:
	src/i18n/strings/en_EN.json
2021-05-11 14:07:47 +01:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Robin Townsend
7efbd2d930 Hide unencrypted badge from ForwardDialog preview
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:57:47 -04:00
Robin Townsend
503301aa89 Make rooms in ForwardDialog clickable
…so that you can jump to a room easily once you've forwarded a message
there.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Robin Townsend
bfba2b0b6f Push ForwardDialog scrollbar into the gutter
…to give more space between it and the buttons.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 11:16:51 -04:00
Šimon Brandner
228b2ccf2d
Increase z-index of call controls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:06:25 +02:00
Robin Townsend
b9b237fc9a Replace forwarding UI with dialog
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Šimon Brandner
430808ae2e
Simplifie CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 16:49:47 +02:00
Travis Ralston
b56d7c9ae8 Scale voice message clock with user's font size
Fixes https://github.com/vector-im/element-web/issues/17185
2021-05-07 19:27:52 -06:00
Šimon Brandner
1f27354439
Add support for up to 4 feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:34:56 +02:00
Šimon Brandner
198722eb41
Add classes for screensharing buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 20:29:45 +02:00
Šimon Brandner
4a6d8ebdf0
Add screensharing icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 20:29:26 +02:00
Travis Ralston
04d566e247
Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1
Fix voice message playback being squished up against send button
2021-05-07 08:00:45 -06:00
Michael Telatynski
1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994
Improve style of notification badges on the space panel
2021-05-07 13:49:41 +01:00
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski
237399f13e fix button height inconsistency between Chrome & FF 2021-05-07 11:40:39 +01:00
Michael Telatynski
9205b74641 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 2021-05-07 10:25:06 +01:00
Michael Telatynski
03ca7e0107 move notification dot on the space panel up by 1px 2021-05-07 10:22:56 +01:00
Travis Ralston
d270e232fd Fix voice message playback being squished up against send button
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
2021-05-06 21:41:04 -06:00
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Travis Ralston
d531e3d59f
Merge pull request #5971 from matrix-org/travis/files/visual
Update visual style of plain files in the timeline
2021-05-06 10:57:22 -06:00
Michael Telatynski
d2fc1c42b0 Improve style of notification badges on the space panel 2021-05-06 15:58:22 +01: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
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Travis Ralston
2236ec3eff Move and update variable usage 2021-05-05 14:00:56 -06:00
Travis Ralston
60e3a8ac77 Merge branch 'develop' into travis/files/visual 2021-05-05 13:47:33 -06:00
Travis Ralston
3e1265b9bb
Merge pull request #5970 from matrix-org/travis/voicemessages/colors
Update colours and sizing for voice messages
2021-05-05 11:09:18 -06:00
Michael Telatynski
70087b30bf Add disclaimer about subspaces being experimental in add existing dialog 2021-05-05 17:53:31 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Travis Ralston
570c082573 Promote colour to a variable
I refuse to try and type this variable name freehand.
2021-05-05 09:58:45 -06:00
Michael Telatynski
81b97590f6 fix styling of the disabled danger_outline button 2021-05-05 16:51:46 +01:00
Michael Telatynski
7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 16:32:31 +01:00
J. Ryan Stinnett
4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal
Warn on access token reveal
2021-05-05 16:32:12 +01:00
Michael Telatynski
acce9a4548 Fix rounded progress bars 2021-05-05 11:50:55 +01:00
Michael Telatynski
07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Travis Ralston
ccdc9fbef6 Fix issue where composer styles were being applied to the timeline 2021-05-04 21:15:22 -06:00
Travis Ralston
b0cb996cac Update visual style of plain files in the timeline 2021-05-04 21:13:37 -06:00
Travis Ralston
a94c1a90c1 Update colours and sizing for voice messages
Fixes https://github.com/vector-im/element-web/issues/17162
2021-05-04 20:45:15 -06:00
Travis Ralston
54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston
2ddc07ed21
Merge pull request #5958 from matrix-org/travis/voicemessages/dark
Support a dark theme for voice messages
2021-05-04 09:03:53 -06:00
Michael Telatynski
caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski
4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Michael Telatynski
d14ea1bd58 Fix layout issue with expanded space panel 2021-05-04 14:01:10 +01:00
Michael Telatynski
c5cbca7c57 Fix edge case with space panel alignment with subspaces on ff 2021-05-04 12:38:55 +01:00
Travis Ralston
ba2da6826f Support a dark theme for voice messages
Fixes https://github.com/vector-im/element-web/issues/17137
2021-05-03 16:08:38 -06:00
Travis Ralston
3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Šimon Brandner
7faf9eb4cc
Use styling for CallPreview
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:39:37 +02:00
Šimon Brandner
fe5fb1885f
Add styling for CallPreview and make it fixed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:39:24 +02:00
Šimon Brandner
b8cb72345c
Remove unnecessary margin
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:39:00 +02:00
Ayush PS
b42872daa4 Fixed the Dial Pad and finalized the changes 2021-05-02 22:10:15 +05:30
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Jaiwanth
f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
Michael Telatynski
158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Travis Ralston
6764b8d645 Change symbol names 2021-04-28 09:29:31 -06:00
Michael Telatynski
5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Michael Telatynski
c0f11fd316 Fix communities spaces beta card layout 2021-04-28 09:35:25 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Michael Telatynski
505b200a87 fix beta pill styling 2021-04-28 08:05:25 +01:00
Travis Ralston
c4d85c457b Add progress effect to playback waveform 2021-04-27 22:59:16 -06:00