element-web/res/css/views
Michael Telatynski 111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
2021-10-08 13:00:20 +01:00
..
audio_messages Get rid of message-body-panel colors 2021-09-27 09:04:51 +02:00
auth Make placeholder more grey when no input (fixes #17243) 2021-09-19 07:48:35 -04:00
avatars Revert "$avatar-bg-color -> $background" 2021-08-24 09:04:17 +02:00
beta Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-06 11:41:09 +01:00
context_menus $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
dialogs Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-10-08 13:00:20 +01:00
directory $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
elements Merge pull request #6840 from wlach/make-placeholder-for-field-grey-no-input 2021-10-08 12:54:57 +01:00
emojipicker $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
groups $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
messages Merge pull request #6868 from SimonBrandner/task/colors-3-mk2 2021-10-01 11:04:15 +02:00
right_panel Merge pull request #6868 from SimonBrandner/task/colors-3-mk2 2021-10-01 11:04:15 +02:00
room_settings Remove some unused components 2020-08-20 20:47:02 -06:00
rooms Remove stale comments in _RoomSublist.scss 2021-10-07 17:28:37 +01:00
settings Decrease profile button touch target 2021-10-03 19:51:46 +01:00
spaces Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-28 15:45:09 +01:00
terms Use variables for the rem values. 2020-03-31 15:26:23 +01:00
toasts Merge remote-tracking branch 'upstream/develop' into task/colors-2 2021-08-24 08:57:12 +02:00
verification Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js 2020-04-07 19:03:12 +01:00
voip Merge pull request #6639 from SimonBrandner/feature/voice-activity 2021-08-25 09:16:37 -06:00