Commit Graph

186 Commits (520659242b799f0574ea535834e79dcd58cc4bab)

Author SHA1 Message Date
Šimon Brandner 5f18e4888c
Improve the look of the keyboard settings tab (#7562)
* First cut of new keyboard shortcuts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove unused code

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* i18n

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Amend shortcuts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Improve CATEGORIES struct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add tests for registerShortcut()

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Simplifie code tiny bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Translate ALTERNATE_KEY_NAME

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix `key` usage

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Export components for tests

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Write snapshot tests

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2022-01-24 11:33:27 +00:00
Šimon Brandner 1f298250b9
Make the `Keyboard Shortcuts` dialog into a settings tab (#7198) 2022-01-17 11:53:10 +00:00
Kerry b1066a5699
Wrap inputs in fieldsets in Space visibility settings (#7350)
* use fieldset in space settings > visibility

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add basic tests for space setttings visibility

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix toggle button placement

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update settings separator color to quinary

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-06 10:09:26 +00:00
Ankur 4752cc184e
Aligned labels with switches for Labs flags (#7232) 2021-12-03 09:16:37 +00:00
Michael Telatynski b69ad0cd0b
Decorate view keyboard shortcuts link as a link (#7260) 2021-12-02 13:43:10 +00:00
Michael Telatynski 27c3153947
Unified room context menus (#7072) 2021-11-15 11:39:25 +00:00
Šimon Brandner 9abb2f5ff4
Color cleanup 8 (#7108)
* $accent-color -> $accent

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $notice-primary-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $notice-primary-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-50pct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $warning-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-darker

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $orange-warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $info-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-11 13:37:29 +00:00
Michael Telatynski 5ad3261cb2
Implement more meta-spaces (#7077) 2021-11-11 13:07:41 +00:00
Andy Balaam 4b903b9fbd
Break ThemeChoicePanel into a separate component (#6998)
* Break ThemeChoicePanel into a separate component

* Tests for ThemeChoicePanel

* i18n fixes

* Fix copyright for ThemeChoicePanel
2021-10-20 14:58:27 +00:00
Andy Balaam 4ad32b16ea Break out font size settings to a separate component 2021-10-19 14:50:09 +01:00
Andy Balaam a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Andy Balaam 4e9a20db21 Move the required CSS for DevicesPanel into its own scss file
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-13 13:55:01 +01:00
Michael Telatynski 02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski 4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Michael Telatynski 29b4ba6675 Use new SCSS vars 2021-09-08 15:30:19 +01:00
Michael Telatynski a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
Šimon Brandner b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
Šimon Brandner 84ad1bec6c
Avoid access token overflow
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 14:40:31 +02:00
Šimon Brandner 10bc85724a
$secondary-fg-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner e5fd19c332
$primary-fg-color -> $primary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Michael Telatynski 0414ea27b8 Iterate PR based on feedback 2021-08-12 15:53:10 +01:00
Michael Telatynski be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Michael Telatynski 195b8714fc Iterate PR based on feedback 2021-08-10 09:55:51 +01:00
Michael Telatynski db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Germain 3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Šimon Brandner 6afd75ac3c
Update/fix licenses
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:40:26 +02:00
Šimon Brandner 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
Michael Telatynski a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01: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
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
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 cc2c179a0f Set default text colour for Settings tabs 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
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
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 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 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
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
Travis Ralston 3c45a39caa Appease the other linter 2019-10-31 16:30:51 -06:00
Travis Ralston 39b657ce7c Add basic structure for (un)subscribing from lists 2019-10-31 15:54:22 -06:00
Travis Ralston b93508728a Add personal list management to Mjolnir section 2019-10-31 14:24:51 -06:00
Travis Ralston 6449016d4b Fix alignment of discovery section addresses
We target the addresses specifically to avoid crushing the subsection text.
2019-08-21 14:41:25 -06:00
Travis Ralston 04bb2ed322
Merge pull request #3327 from matrix-org/travis/discover-terms
Handle terms agreement in Discovery section of user settings
2019-08-21 10:14:45 -06:00
Travis Ralston f55a40001c Touch up settings: alignment, spacing, error states
Fixes https://github.com/vector-im/riot-web/issues/10554

Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything)
2019-08-20 13:20:07 -06:00
Travis Ralston 3181829532 Use new InlineTermsAgreement component on IS Discovery section
Fixes https://github.com/vector-im/riot-web/issues/10522
2019-08-19 23:00:05 -06:00
J. Ryan Stinnett 8a7b43fd1a Tweak Settings padding / margin slightly
This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
2019-08-19 15:45:04 +01:00
David Baker e07c22a78d Make mixin for fields in settings that need to be the same width
and make that width narrower so we can fit a tooltip in the left
hand side (they were a little too wide anyway for the kind of data
being entered, even on a narrow window).
2019-08-13 12:53:14 +01:00
J. Ryan Stinnett dd2079bffc Auto-fix stylelint issues
These `stylelint` issues were autofixed by the tool itself and look sane to me.
2019-07-10 16:56:40 +01:00