Commit Graph

196 Commits (ca6ed648117c0b297da50cd784afaf7b93666f31)

Author SHA1 Message Date
Šimon Brandner 71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
Andy Balaam 690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Andy Balaam 7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +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
ColonisationCaptain a076bee764 Decrease profile button touch target 2021-10-03 19:51:46 +01:00
Šimon Brandner 14466b1e3b
$settings-profile-placeholder-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:43:46 +02: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
Michael Telatynski 381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +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 2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
James Salter 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
Š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