Commit graph

1417 commits

Author SHA1 Message Date
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06: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
50124d3476
Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression
Increase specificity of compact layout selectors
2020-06-01 18:11:52 +01:00
Jorik Schellekens
85978426c9 Fix selectors 2020-06-01 16:45:19 +01:00
Jorik Schellekens
03c6813425
Update res/css/views/rooms/_GroupLayout.scss
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-06-01 16:00:11 +01:00
Jorik Schellekens
b48818bb46 Increase specificity of compact layout selectors 2020-06-01 15:23:34 +01:00
Jorik Schellekens
69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +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
David Baker
f54bac0e95 Use recovery keys over passphrases
Step 1 - change CreateSecretStorageDialog to just give a recovery key
rather than a passphrase.
2020-05-29 15:42:07 +01:00
Michael Telatynski
f40cfe4a3b Implement new design with new iconography
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 15:00:27 +01:00
Jorik Schellekens
66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Jorik Schellekens
930b8ff901
Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab
Stop copy icon repeating weirdly
2020-05-28 19:57:46 +01:00
Jorik Schellekens
1ab6f27535 Stop copy icon repeating weirdly. 2020-05-28 19:37:49 +01:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
Migrate Banners to Toasts
2020-05-28 18:21:28 +01:00
Michael Telatynski
8aaa7825ef Also kill off things that these kept behind
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:12:19 +01:00
Michael Telatynski
f0cabd55c0 Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
as we now always `setGlobalErrorOnUnknownDevices(false)`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:01:22 +01:00
Jorik Schellekens
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc
Fix encryption icon miss-alignment
2020-05-27 17:05:32 +01:00
Jorik Schellekens
5c3208d942
Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression
Fix sublist sizing regression
2020-05-27 17:04:49 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Jorik Schellekens
73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
Jorik Schellekens
792859b939 Fix lines overflowing room list width 2020-05-26 17:39:39 +01:00
Jorik Schellekens
d8836f0f4b Fir sublist sizing regression 2020-05-26 17:09:42 +01:00
David Baker
563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +01:00
Michael Telatynski
db6853e022 Fix Emoji Picker footer being too small if text overflows
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 20:00:02 +01:00
Michael Telatynski
891ba1bbe3 Replace New Version Bar with a Toast
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 23:08:45 +01:00
David Baker
ef4d0a8051 Make linter happy 2020-05-22 10:33:19 +01:00
Travis Ralston
a425c5440b Fix visibility of message timestamps
Fixes https://github.com/vector-im/riot-web/issues/13736

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
2020-05-21 16:34:23 -06:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Travis Ralston
b96c1ada8a
Merge pull request #4494 from pv/auxpanel-scrolling-persisted
Prevent PersistedElements overflowing scrolled areas
2020-05-19 15:28:58 -06:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens
5380e76b7b lint 2020-05-18 16:43:47 +01:00
Jorik Schellekens
17f535e5f8 Fix review problems
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
Michael Telatynski
8bab8be3dd delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 21:01:49 +01:00
Michael Telatynski
f2979f3fd8 replace zxcvbn field in CreateKeyBackupDialog with PassphraseField
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:59:46 +01:00
Michael Telatynski
865495dd69 replace zxcvbn field in CreateSecretStorageDialog with PassphraseField
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:50:22 +01:00
Michael Telatynski
cf3c4d9e5f Extract Password field from Registration into a reusable component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:20:36 +01:00
Michael Telatynski
09a4af49f3 Consolidate zxcvbn progress bars into a component and add dynamic colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 18:49:55 +01:00
Michael Telatynski
47ff67c6be
Merge pull request #4586 from matrix-org/revert-4448-t3chguy/imageview
Revert "ImageView make clicking off it easier"
2020-05-14 17:31:37 +01:00
Michael Telatynski
d1c6f3099c move styling to QRCode scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:06 +01:00
Michael Telatynski
1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
 Conflicts:
	package.json
2020-05-14 10:50:42 +01:00
Jorik Schellekens
fc6e5227ac FIx roomsublist heights.
- also fiddles the font size numbers
2020-05-13 22:24:22 +01:00
Jorik Schellekens
5c2abcf1a4 Show username on continuations 2020-05-13 17:05:37 +01:00
Jorik Schellekens
328bb7bcaf Remove all animations 2020-05-13 15:24:08 +01:00
Jorik Schellekens
3f04f5163a Implement more nitpicks
- fix avatar inital aligment
- right align names
- set flair height to avatar's
- fix conditions for resizing to be more stable
2020-05-13 14:04:46 +01:00
Michael Telatynski
d63008f9c5
Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0
Replace png flags and add Kosovo to country code dropdown
2020-05-13 09:58:10 +01:00
Michael Telatynski
52e3c97f8c
Revert "ImageView make clicking off it easier" 2020-05-13 06:36:14 +01:00
Jorik Schellekens
5029c3f143 Implement IRC draggable display name width 2020-05-13 02:16:43 +01:00
Michael Telatynski
004f75f289 Rename trash (custom).svg as electron doesn't like serving files with spaces
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 16:16:47 +01:00
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:18 +01:00
Jorik Schellekens
fef4d882c4 lint 2020-05-08 22:35:40 +01:00
Jorik Schellekens
82396661cf Implement nitpicks
- usernames are elipsed
- icon alignment fixed
- replies are more dense
- reply messages respond to name widths
- fixed between message padding problem (flex ftw)
2020-05-08 22:21:26 +01:00
Michael Telatynski
6ff093f5a3 Bring back UnknownBody for UISIs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-08 19:15:59 +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
Jorik Schellekens
ac95172ed4 tighter layout 2020-05-07 14:56:45 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies.
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
2020-05-07 14:04:56 +01:00
Jorik Schellekens
5568e6488d Fix encryption badge layout 2020-05-07 14:04:34 +01:00
Jorik Schellekens
0af265bf93 Fix replies 2020-05-07 14:04:34 +01:00
Jorik Schellekens
027826c2e1 Replies have the same layout as messages 2020-05-07 14:04:33 +01:00
Jorik Schellekens
67249e1e9c Fix hover 2020-05-07 14:04:33 +01:00
Jorik Schellekens
6c3e3161de Reduce padding 2020-05-07 14:04:33 +01:00
Jorik Schellekens
10c8d253c8 Create irc layout 2020-05-07 14:04:33 +01:00
Jorik Schellekens
c1e740a596 Break out group layout settings 2020-05-07 14:04:33 +01:00
Michael Telatynski
4d6cd3c050 Update padding-left to 20px as per Nad's iteration
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-07 12:50:04 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +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
Jorik Schellekens
bab7d5f461 Some lints 2020-05-06 17:25:54 +01:00
Jorik Schellekens
d62e6ed05d
Merge pull request #4546 from JorikSchellekens/joriks/font-scaling-regressions
Fix slider toggle regression.
2020-05-06 17:08:18 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Michael Telatynski
c00b070269 Fix reply RR spacing getting doubled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-03 13:28:16 +01:00
Zoe
3acb952d9a
Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress
Show progress when loading keys
2020-04-30 14:09:47 +01:00
Zoe
465442c31e fragments and i18n don't play nice together 2020-04-29 15:13:24 +01:00
Zoe
326d567468 Fixed the dialog height 2020-04-29 14:29:36 +01:00
Bruno Windels
8c28977c27
Merge pull request #4514 from JorikSchellekens/joriks/font-scaling-fixes
Fix pill vertical align
2020-04-29 10:07:44 +00:00
Jorik Schellekens
2e7ccf6e7a Fix pill vertical align 2020-04-29 10:57:35 +01: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
Bruno Windels
d723aa9efe
Merge pull request #4508 from matrix-org/bwindels/moarthemingfixes
Small custom theming fixes
2020-04-28 15:25:53 +00:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Bruno Windels
198edb06b9 use normal accessible button, which is themed 2020-04-28 16:35:20 +02: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
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Michael Telatynski
9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
Michael Telatynski
433b166190
Merge pull request #4501 from matrix-org/t3chguy/fix_floats
only clear on continuations where the clear isn't done by SenderProfile
2020-04-27 18:36:48 +01:00
Jorik Schellekens
66067719f4 Small fixes 2020-04-27 18:36:05 +01:00
Michael Telatynski
da7a2f2f62 only clear on continuations where the clear isn't done by SenderProfile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 17:50:50 +01:00
Jorik Schellekens
55084e918c Really fix info avatar 2020-04-27 17:40:37 +01:00
Jorik Schellekens
a772d959a7 Remove redundent padding property and use em 2020-04-27 11:51:56 +01:00
Jorik Schellekens
669562b90c Extra right padding in user pills 2020-04-27 11:51:56 +01:00
Jorik Schellekens
7502c2d9d1 Scale user photo upload with font size 2020-04-27 11:51:56 +01:00
Jorik Schellekens
a0b610c576 Skinnier pills are easier to swallow 2020-04-27 11:51:56 +01:00
Jorik Schellekens
5dc7703740 Undo superfluous delete 2020-04-27 11:51:56 +01:00
Jorik Schellekens
c7c94933ee Use font-variable instead of rem 2020-04-27 11:51:55 +01:00
Jorik Schellekens
6338325d5c Use rem instead of em. 2020-04-27 11:51:55 +01:00
Jorik Schellekens
997fe62e5c FIx lanugage selection alignment at scale. 2020-04-27 11:51:55 +01:00
Jorik Schellekens
aac90e4eb1 Room memebers avatars scale 2020-04-27 11:51:55 +01:00
Jorik Schellekens
0fe0d728f1 lint 2020-04-27 11:51:55 +01:00
Jorik Schellekens
633c6f6b5e Fix settings when scaling up 2020-04-27 11:51:55 +01:00
Jorik Schellekens
f59bd538b4 Resize toggle switches with font 2020-04-27 11:51:55 +01:00
Jorik Schellekens
b921159da8 Fix room header vertical alignment 2020-04-27 11:51:54 +01:00
Jorik Schellekens
5113723154 Fix avatar alignment for room state events 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e03442048c Scale read receipt images 2020-04-27 11:51:54 +01:00
Jorik Schellekens
334f529c26 Scale room tile heights. 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e2aef3a62b Fix pills.
This was a hard pill to swallow
2020-04-27 11:51:54 +01:00
Jorik Schellekens
92005b15d8 Fix event tiles to smoothly resize with font. 2020-04-27 11:51:54 +01:00
Michael Telatynski
4fc8fc9d6c cap width of editable item list item to leave space for its X remove button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-26 12:52:17 +01:00
Pauli Virtanen
d690d4bed2 Prevent PersistedElements overflowing scrolled areas
As the DOM element is not in reality contained inside "the parent",
it may overflow the area if the parent gets partially hidden by
scrolling etc.

To make the effect visually less annoying, emulate this by clipping to
the element wrapper. This is not a full general-purpose fix, but
improves the current situation.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
2020-04-25 16:09:46 +03:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:07:39 +01:00
Jorik Schellekens
600a812227 Add brush icon for appearance setting tab 2020-04-23 12:20:10 +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
98799611cf Remove padding for alignment reasons 2020-04-23 10:45:48 +01:00
Jorik Schellekens
1486beeaf4 Make slider indpendent of settings styling 2020-04-23 10:45:48 +01:00
Jorik Schellekens
5f50facfba Make slider independant of label size 2020-04-23 10:45:48 +01:00
Jorik Schellekens
9a585fee0a Move slider themes 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
e10a511997 Extra right padding in user pills 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
fc04266b42 Skinnier pills are easier to swallow 2020-04-23 10:45:47 +01:00
Jorik Schellekens
18efbccceb Undo superfluous delete 2020-04-23 10:45:47 +01:00
Jorik Schellekens
07853f48bb Use font-variable instead of rem 2020-04-23 10:45:47 +01:00
Jorik Schellekens
c921859067 Use rem instead of em. 2020-04-23 10:45:47 +01:00
Jorik Schellekens
121b53f99a FIx lanugage selection alignment at scale. 2020-04-23 10:45:47 +01:00
Jorik Schellekens
a58721047e Room memebers avatars scale 2020-04-23 10:45:47 +01:00
Jorik Schellekens
5caec2a289 lint 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
cc601e1595 Resize toggle switches with font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
f29717ee62 Fix room header vertical alignment 2020-04-23 10:45:46 +01:00
Jorik Schellekens
d12ed333c1 Fix avatar alignment for room state events 2020-04-23 10:45:46 +01:00
Jorik Schellekens
f54ca219cf Scale read receipt images 2020-04-23 10:45:46 +01:00
Jorik Schellekens
27b1ce841f Scale room tile heights. 2020-04-23 10:45:46 +01:00
Jorik Schellekens
1ff0f3445a Fix pills.
This was a hard pill to swallow
2020-04-23 10:45:46 +01:00
Jorik Schellekens
f10d9e47e7 Fix event tiles to smoothly resize with font. 2020-04-23 10:45:46 +01:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Michael Telatynski
c77589c9f7
Merge pull request #4439 from matrix-org/t3chguy/network_dropdown
Network Dropdown fix things not scrolling properly
2020-04-20 13:57:42 +01:00
Michael Telatynski
4494c6cf2b ImageView make clicking off it easier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 11:21:51 +01:00
Michael Telatynski
a0f704f419 Network Dropdown fix things not scrolling properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-18 15:08:15 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Michael Telatynski
cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
2020-04-17 12:58:54 +01:00