Commit Graph

221 Commits (8c20bcfe560f303b1c6cb9d9f3a42392018d1b12)

Author SHA1 Message Date
Šimon Brandner 2dc13dedf0
Fix font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
Šimon Brandner 9ef70f027e
Make the version box smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 11:36:53 +02:00
Šimon Brandner 44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 2021-08-02 11:32:57 +02:00
Michael Telatynski ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski 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
Travis Ralston 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
Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Germain Souquet c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Germain Souquet 6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02:00
Šimon Brandner c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:19:31 +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
Travis Ralston d2de9b432c
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
Travis Ralston ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00
Michael Telatynski e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01: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 b3ac0c71e1
Fix access token copy button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 12:17:51 +02: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
Aaron Raimist 6754a0b483
Switch to <details>
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-27 19:12:22 -05:00
Michael Telatynski c5f653245a Show Spaces beta card in Labs & My Communities view
the image is temporary
2021-04-27 16:29:42 +01:00
Šimon Brandner 5de99c7708
Fix licenses
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-18 19:40:24 +01:00
Šimon Brandner bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
Šimon Brandner c4a3906871
Fix positioning of spinner in a smarter way
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:38:43 +01:00
Šimon Brandner 4a282759c3
Fixed jumpy UI
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 16:38:07 +01:00
Šimon Brandner ffe2727cf7 Fixed topic field resizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 09:40:39 +01:00
Šimon Brandner 7609f2004e Added newline to end 2020-11-29 13:22:50 +01:00
Šimon Brandner 8f40cd39fd Added styling 2020-11-29 12:29:05 +01:00
Michael Telatynski 00e35dafb3 Fix aspect ratio of avatar before clicking Save
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 10:57:34 +01:00
Michael Telatynski cf37f0abf2 Fix the AvatarSetting avatar getting crushed by the flexbox
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-05 12:54:01 +01:00
Travis Ralston aa0e19daf0 Make the hover transition a variable 2020-09-24 08:23:06 -06:00
Travis Ralston e658d9619b Update styles for new colours 2020-09-23 12:30:01 -06:00
Travis Ralston 3e0cbd7bfe Appease the linters 2020-09-21 21:09:46 -06:00
Travis Ralston 4f983ad9a1 Rework profile sections of user and room settings
Mostly by design request. Some is freehand, to be reviewed.
2020-09-21 21:00:51 -06:00
Travis Ralston 6fee3d8f4f Spread out the general user settings sections like the other tabs
By design request.
2020-09-21 18:37:08 -06:00
J. Ryan Stinnett 3259ab1f25 Place cross-signing action buttons on a single row
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett bbe2084f66 Add independent set up / reset actions in Settings
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
J. Ryan Stinnett 2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01: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
Jorik Schellekens 447ef63950 Replace old checkboxes 2020-07-27 16:36:31 +01:00
Bruno Windels 38ff58f8dd remove upload icon 2020-07-07 12:16:16 +02:00
Michael Telatynski af5f9b7c41 revert dark mode separator colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:53:06 +01:00
Michael Telatynski c8bb6f5904 Improve radio outlines for message layout to be more consistent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:48:22 +01:00
Jorik Schellekens 0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
Jorik Schellekens d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens aab42a291b implement appearance tab nits
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
2020-06-22 12:28:15 +01:00
Jorik Schellekens a250bf6a97 Fix whitespace 2020-06-16 18:08:49 +01:00
Jorik Schellekens 2d6077f2c8 Fix radio circle color 2020-06-16 18:02:34 +01:00
Jorik Schellekens 2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
Jorik Schellekens 17dbb1ac8b Message preview for font slider 2020-06-16 15:41:10 +01:00
Jorik Schellekens 045217ee8d fix style 2020-06-15 17:46:16 +01:00
Jorik Schellekens 02ccdcb802 Fix field width and add tooltip 2020-06-15 17:42:30 +01:00
Jorik Schellekens edb6bbc6c0 Implement font selection 2020-06-15 15:33:52 +01:00
Jorik Schellekens d44fbda834 Make disabled checkbox look more convincingly useless 2020-06-15 12:23:14 +01:00
Jorik Schellekens 3b1f0db3e1 Use smaller top margin for selectors 2020-06-15 12:06:40 +01:00
Jorik Schellekens cf392af52f Address design issues and set theme at device level 2020-06-11 12:27:09 +01:00
Jorik Schellekens 24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Michael Telatynski 170acef796 Fix sizing of the security warning icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 21:54:38 +01:00
Michael Telatynski d3523afd29 delint scss and i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:11:47 +01:00
Michael Telatynski 702bbe3bcd Add e2ee-default:false notice to Setting>Security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:14 +01:00
Michael Telatynski efd0da44a1 Give contextual feedback for manual update check instead of banner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 18:24:45 +01:00
Jorik Schellekens 33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Travis Ralston 9ae812c346 Add a loading state for email addresses/phone numbers in settings
Fixes https://github.com/vector-im/riot-web/issues/13432
2020-05-06 15:17:55 -06:00
Michael Telatynski a63dd664a1 fix font-size
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-28 17:57:32 +01:00
Michael Telatynski 32c512dbfe Fix internal link styling in Security Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-28 17:49:10 +01:00
Jorik Schellekens eb72245493 fix syntax error 2020-04-28 15:19:12 +01:00
Jorik Schellekens f91613f112 Remove redundent selectors.
Check _AppearanceUserSettingsTab
2020-04-28 14:20:49 +01:00
Jorik Schellekens 7502c2d9d1 Scale user photo upload with font size 2020-04-27 11:51:56 +01:00
Jorik Schellekens 633c6f6b5e Fix settings when scaling up 2020-04-27 11:51:55 +01:00
Jorik Schellekens a83993f1ff Match margins in settings 2020-04-23 11:49:54 +01:00
Jorik Schellekens 28dca9e525 Match figma color scheme 2020-04-23 11:33:28 +01:00
Jorik Schellekens 6375e25263 Match padding from figma 2020-04-23 11:22:51 +01:00
Jorik Schellekens a16fe09d42 Use em to detach slider from root font-size 2020-04-23 10:58:00 +01:00
Jorik Schellekens fe175bb9a8 Styling for the font slider 2020-04-23 10:45:48 +01:00
Jorik Schellekens 315a272cb4 File rename 2020-04-23 10:45:48 +01:00
Jorik Schellekens af3858fa98 Style linting 2020-04-23 10:45:47 +01:00
Jorik Schellekens 0faf7b865f Set font option width 2020-04-23 10:45:47 +01:00
Jorik Schellekens 83609f0ab2 Scale user photo upload with font size 2020-04-23 10:45:47 +01:00
Jorik Schellekens 0182128189 Fix settings when scaling up 2020-04-23 10:45:47 +01:00
Jorik Schellekens 6cf9166c4a Use variables for the rem values.
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
2020-03-31 15:26:23 +01:00
Jorik Schellekens da34e6241d Make all 'font-size's and 'line-height's rem
Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.

I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.

This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly.
2020-03-30 18:23:46 +01:00
David Baker 327b3c860b Adding the files would help 2020-03-25 18:47:57 +00:00
Bruno Windels 351398ada9 fix style lint 2020-03-16 18:34:09 +01:00
Bruno Windels f7eecc0921 avoid double margin-right for toggle 2020-03-16 17:29:15 +01:00
J. Ryan Stinnett 3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
Ben Parsons a6882cece1 increase margin between Settings sections 2020-03-05 14:10:44 +00:00
Michael Telatynski 1875bf4bfe remove the first preference section's margin
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:18:01 +00:00
Michael Telatynski 6a66c4162b Space preference sections out more significantly to make the section headers obvious
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:16:27 +00:00
unknown 20fc8514a5 I have added spacing, as devices are very hard to read otherwise 2020-02-02 18:47:16 +01:00
Michael Telatynski 7b4ad61bea post-merge fix 2019-12-16 16:23:35 +00:00
Michael Telatynski 5ab98e9899 open ImageView when clicking on a set avatar 2019-12-16 15:21:05 +00:00
Michael Telatynski 9fa2680dc6 Implement new design for uploading/removing avatars 2019-12-16 14:58:12 +00:00
J. Ryan Stinnett c103fe4273 Add cross-signing diagnostic panel
This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development.
2019-11-29 11:29:08 +00:00
Travis Ralston 72f0401589 Merge branch 'develop' into jryans/4s-new-key-backup 2019-11-21 10:22:13 -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
J. Ryan Stinnett 9dea848927 Use div around buttons to fix React warning 2019-11-19 16:28:49 +00:00