0ee59a17de
Fix PiP of held calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 18:42:55 +02:00
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
...
* origin/develop: (1278 commits)
Add a little padding
Keep number field in focus when pressing dialpad buttons (#6520 )
Remove old version
Fix video call persisting when widget removed
Update link to matrix-js-sdk CONTRIBUTING file (#6557 )
$toast-bg-color -> $system
$system-... -> $system
Iterate PR based on feedback
Remove unnecessary code
Use AccessibleTooltipButton
Just upload the PR object itself
Edit PR Description instead of commenting
publish the right directory
Fix Netflify builds from fork PRs
This doesn't need to be here as it was moved into CallViewButtons
Make scrollbar dot transparent
Iterate PR based on feedback
Don't set hidden RRs labs setting at account level
Add a comment for weirdly placed div
Add full class names to animations.scss
...
2021-08-13 15:12:07 +02:00
cda91e44e0
Use new call state icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
fa204c4104
Add declined call buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:34:11 +02:00
c79852a9f0
Left align call tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
5ac5640939
Add a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:35:31 +02:00
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398
2021-08-13 10:30:21 +02:00
c34dedb57b
Fix legacy themes backports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:20:05 +02:00
25a3a8ddfd
$roomlist-header-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
4604d817c4
$roomlist-filter-active-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
8e610e5947
$dialpad-button-bg-color -> $quinary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
0faedebb92
$roomheader-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
a3a6f73049
$avatar-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:37 +02:00
57ce895445
$text-primary-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:37 +02:00
79d76d8b49
$base-text-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:36 +02:00
eea3b31993
$bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:36 +02:00
04bb07cdad
$base-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:35 +02:00
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
7ce88c9966
$toast-bg-color -> $system
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:20:30 +02:00
aca073f5da
$system-... -> $system
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:16:13 +02:00
85b1f166e8
post-merge tidy up
2021-08-12 12:03:14 +01:00
fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux
...
Make loading encrypted images look snappier
2021-08-12 12:55:52 +02:00
0a209afdc2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
res/css/structures/_SpaceHierarchy.scss
src/components/structures/SpaceHierarchy.tsx
src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y
2021-08-11 23:18:52 +01:00
2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474
...
Remove tiny scrollbar dot from code blocks
2021-08-11 13:54:47 -06:00
abba7983ce
Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons
...
Move Call View Buttons into a separate component
2021-08-11 18:09:48 +01:00
c93cc89cca
Merge pull request #6540 from SimonBrandner/task/color-cleanup-1
...
First cleanup of the theme files
2021-08-11 10:55:27 -06:00
a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer
...
Improve handling of pills in the composer
2021-08-11 10:55:13 -06:00
5bc165f2ac
Make scrollbar dot transparent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:33:16 +02:00
d74e9c4f90
Remove impossible space hierarchy size string
2021-08-11 16:47:14 +01:00
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
ef3737d179
Add full class names to animations.scss
2021-08-11 10:52:22 +02:00
c872609ed3
Modify encrypted images loading for better UX
...
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
2021-08-10 19:24:17 +02:00
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
77cf5bf613
Update space create menu copy and add link to community migrator
2021-08-10 11:30:00 +01:00
195b8714fc
Iterate PR based on feedback
2021-08-10 09:55:51 +01:00
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
0f49fe92c6
iterate spaces treeview stuff
2021-08-09 14:01:34 +01:00
d0e76a0ecd
Use CallViewButtons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:20:17 +02:00
0cad9ed14a
Add _CallViewButtons.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:15:18 +02:00
92a60497d2
Merge pull request #6572 from matrix-org/travis/voice-messages/stop-left
...
Move stop button to the left of the waveform
2021-08-07 09:09:21 -06:00
390a3ebcbd
Merge pull request #6579 from SimonBrandner/family-friendly-branch-name
...
Fix source picker sizing issues (again)
2021-08-07 15:50:17 +02:00
54b5c8554a
Fix source picker sizing issues (again)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 12:00:50 +02:00
fe1dfa209a
rethemendex
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 10:13:27 +02:00
b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture
...
Refactor Calls components into smaller pieces for future Widgets work
2021-08-06 18:03:30 +02:00
fbe8f04942
Fix height jump of recording states
...
Fixes https://github.com/vector-im/element-web/issues/18431
2021-08-06 09:04:36 -06:00
cab4f2e402
Move stop button to the left of the waveform
...
Fixes https://github.com/vector-im/element-web/issues/18416
2021-08-06 09:00:18 -06:00
4328083ea7
Rename css
2021-08-06 16:31:04 +02:00
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout
2021-08-06 14:45:54 +01:00
225ac0ae5a
Merge pull request #6568 from benneti/develop
...
allow customizing the bubble layout colors
2021-08-06 14:43:33 +01:00
41475a3b94
fix keyboard focus issue around the space hierarchy
2021-08-06 14:12:55 +01:00
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603
2021-08-06 12:56:38 +01:00
35386078a4
Post-merge changes
2021-08-06 13:25:27 +02:00
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture
...
* origin/develop: (100 commits)
Add comments to isRegionalIndicator
Stop voice messages that are playing when starting a recording
Properly set style attribute on shared usercontent iframe
Fix in-call context menus when in PiP mode (#6552 )
Extract tooltipYOffset to a const
Increase yOffset by 4px away
i18n
Post-merge conflict resolution and improve alignment of tooltips
Fix image & blurhash info when skipping thumbnail due to thresholds
Skip sending a thumbnail if it is not a sufficient saving over the original
Null guard space inviter to prevent the app exploding
Remove seams from pin icon
Appease Jest
Fix worklet reference for new webpack pipeline
i18n
Update copy
Fix wrong cursor being used in PiP
Fix voice feed cut-off
Use flex-start as it has more universal support
Wrap cases in {}
...
2021-08-06 13:25:14 +02:00
02be0fd300
allow customizing the bubble layout colors
...
- correct fallback values in the _legacy_dark.scss files
- read variables to override default values
2021-08-06 13:10:33 +02:00
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
64995dfae7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-06 11:39:24 +01:00
6afd75ac3c
Update/fix licenses
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:40:26 +02:00
25c6b216b0
Move LayoutSwitcher CSS to a separate file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:37:42 +02:00
3c0ac487da
Remove comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:06:24 +02:00
f57bffad3c
Soften border color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:05:33 +02:00
b1fe59eea3
Revert changes which didn't make much sense and remove some comments
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 08:34:46 +02:00
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
2021-08-06 08:02:28 +02:00
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
2021-08-06 07:53:07 +02:00
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
27d7daeceb
Merge pull request #6550 from SimonBrandner/fix/voice-cutoff
...
Fix voice feed being cut-off
2021-08-05 15:46:42 -06:00
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start
...
Use `flex-start` instead of `start`
2021-08-05 15:46:12 -06:00
4dcf2c7038
Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281
...
Fix sizing issues of the screen picker
2021-08-05 15:39:12 -06:00
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
...
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
...
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 14:36:55 +02:00
efeae3a84c
Top align the avatar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 13:39:39 +02:00
5fa6ef83d2
Fix button alighnment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 12:35:44 +02:00
9e4f5719a4
Handle narrow layouts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 11:47:58 +02:00
5e3b79eeca
Remove seams from pin icon
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 18:42:47 -04:00
7b8a43bd2b
Merge pull request #6551 from SimonBrandner/fix/pip-cursor/18383
...
Fix wrong cursor being used in PiP
2021-08-04 16:41:49 +01:00
91b4b50969
Fix wrong cursor being used in PiP
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:25:12 +02:00
e2bc76a129
Fix voice feed cut-off
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:17:21 +02:00
fe643b2401
Use flex-start as it has more universal support
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:09:48 +02:00
724c67bc21
Merge pull request #6548 from robintown/fix-fallback-fonts
...
Fix fallback fonts
2021-08-04 16:00:22 +01:00
5877e936c0
Fix fallback fonts
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 09:24:18 -04:00
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
b4b788e8d5
Fix right margin for events on IRC layout
...
Fixes vector-im/element-web#18354
2021-08-04 11:21:52 +02:00
c89560691d
Some de-duplication for the light theme
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:16 +02:00
3c12a5a995
Some de-duplication for the dark theme
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:16 +02:00
fbb79a17e3
Add Figma colors to light theme
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:15 +02:00
bc701a182b
Add Figma colors to dark theme
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:15 +02:00
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
ca94518de5
Improve bubble colors
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:46:09 +02:00
050e260655
Fix weird spacing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:45:58 +02:00
7fc632d0cf
Put font names into "" so that stylelint shuts up about them
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:42:07 +02:00
8f3bdf7dad
Merge remote-tracking branch 'upstream/develop' into fix/bubble-bg-color/18081
2021-08-04 08:12:27 +02:00
24da0291a0
Re-center recording LED
...
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
7b565db02d
Update uploading state designs
2021-08-03 12:52:21 -06:00
3ab54bce6e
Move CallViewHeader css to separate file
2021-08-03 15:21:14 +02:00
1b87ffb7cb
Merge pull request #6527 from SimonBrandner/fix/font-topic/18339
...
Fix the wrong font being used in the room topic field
2021-08-03 10:06:58 +01:00
c5d11a9f17
Improve voice messages uploading state
...
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
...
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
2dc13dedf0
Fix font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
9ef70f027e
Make the version box smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 11:36:53 +02:00
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
2021-08-02 11:32:57 +02:00
442992b30e
Fix symbol entry in the in-call dialpad ( #6521 )
...
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.
RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786 ,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
...
Improve download interactions
2021-07-30 10:50:27 -06:00
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration
...
Fix inconsistent styling for links on hover
2021-07-30 14:08:15 +02:00
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093
2021-07-30 12:25:44 +01:00
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
259627fba2
Clean up SpaceHierarchy
2021-07-30 11:01:49 +01:00
adfbcdce40
Fix the inconsistent styling between non-markdown and markdown parsed links on hover.
...
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).
https://webaim.org/techniques/hypertext/link_text#underlining
2021-07-30 09:54:28 +02:00
11322b8999
Appease linter
2021-07-30 09:19:34 +02:00
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
fb89b45c06
Unify and improve download interactions
...
With help from Palid.
This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).
The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
f69b4549dd
Re-add top border stroke in space create menu
2021-07-29 15:13:02 +01:00
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
...
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
cb89dd408c
Use mic mute icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091
2021-07-29 13:20:19 +01:00
56cd0e1c4f
Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249
...
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 12:20:56 +01:00
6c68f779ec
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 11:58:32 +02:00
9c4101fa89
Align event list summary read receipts when using message bubbles
2021-07-29 11:48:22 +02:00
78a9117598
Prevent timeline flickering on hover
2021-07-29 11:12:07 +02:00
e140dd6ba1
Merge branch 'develop' into gsouquet/fix-18132
2021-07-29 10:27:00 +02:00
152168ef2d
Add mic mute icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 10:20:59 +02:00
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +02:00
f16b1d46b7
Fix sizing issue of the screen picker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 20:58:24 +02:00
9fb1c8e4cd
Iterate PR
2021-07-28 19:33:07 +01:00
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
a5606c72de
Update feedback prompt to match designs
2021-07-28 17:56:57 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
67ef263940
Refactor SpaceButton to be more reusable and add context menu to Home button
2021-07-28 17:40:33 +01:00
cdf0d98c3f
Fix IconizedContextMenuCheckbox layout
2021-07-28 17:39:02 +01:00
07b9d6b30b
Fix styling of setting flag descriptions in preferences
...
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
e445c9c3ff
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 13:28:11 +02:00
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221
2021-07-28 11:10:37 +01:00
a4cf147d72
Merge branch 'develop' into gsouquet/fix-18264
2021-07-28 10:30:29 +02:00
3694006d05
Realign reactions row with messages in modern layout
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 23:48:51 -04:00
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
...
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Šimon Brandner