Commit graph

1761 commits

Author SHA1 Message Date
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
Bruno Windels
3d094ea542
Merge pull request #4503 from matrix-org/bwindels/customthemechanges
Support setting username and avatar colors in custom themes
2020-04-28 09:06:08 +00: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
Bruno Windels
e8e99c2646 Use color values for default avatar backgrounds
We still need to convert them to URLs for the notification icon,
so use a canvas (with a cache in front of it) to do that.
2020-04-27 19:35:38 +02: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
Bruno Windels
b1870660d8 support theming username colors 2020-04-27 17:31:22 +02:00
Bruno Windels
2f68f608c5 add 15pct value of accent color for FormButton backgrounds
so the button in the toasts has the correct background color
2020-04-27 17:30:28 +02: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
41fd9ee015 FIx unread count 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
352ae555f8 Fix community line height 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
969f0e9e0d Commuity seleciton bar vertical alignment scale fix 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
06f4eca05d Background opacity 2020-04-23 14:15:33 +01:00
Jorik Schellekens
61b45afcd3 Slightly darker toggle off bg color 2020-04-23 12:28: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
abd94a65bd Move compoenets/FontSlider to views/Slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
dd841fcde9 Remove references to font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
787e408016 Explain origin of magic number
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:47 +01:00
Jorik Schellekens
af3858fa98 Style linting 2020-04-23 10:45:47 +01:00
Jorik Schellekens
647d99a17a Smooth font-size change transition 2020-04-23 10:45:47 +01:00
Jorik Schellekens
df73f12320 Make a font slider 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
7a0caafb77 FIx unread count 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
c2a2908746 Fix community line height 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
e49c041df7 Commuity seleciton bar vertical alignment scale fix 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
a06401a83e stage new artifacts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:57:00 +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
Michael Telatynski
4d91dc5bba iterate pills in rich text styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:30:09 +01:00
Michael Telatynski
c3ff75d18f Don't break spills over multiple lines, ellipsis them at max-1-line
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 11:04:52 +01:00
Michael Telatynski
bedffdb8e2 Fix Message Context Menu options not displaying: block
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 01:46:32 +01:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00
Bruno Windels
368737cfd9 fix copyright 2020-04-14 17:41:06 +02:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Michael Telatynski
8d3119ddb4
Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel
Fix width of MVideoBody in FilePanel
2020-04-14 15:02:28 +01:00
Michael Telatynski
a7d95d396e fix copyright
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:46:04 +01:00
Michael Telatynski
3e057070fd Fix width of MVideoBody in FilePanel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:56:21 +01:00
Michael Telatynski
71b4aab5dc Fix emoji tooltip flickering because onMouseOut&onMouseOver fired when moving between children
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:12:58 +01:00
Michael Telatynski
237084da78 wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:46:58 +01:00
Michael Telatynski
740b6f6cac Composer pills respect showPillAvatar setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 09:34:38 +01:00
Michael Telatynski
74291e8c2d
Merge pull request #4370 from matrix-org/t3chguy/clear_event_line
Fix image thumbnail width when read receipts are hidden
2020-04-09 20:57:12 +01:00
Michael Telatynski
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
Michael Telatynski
60808ef6d2 apply clear:both to fix automatic margins for continuation events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 13:36:53 +01:00
Michael Telatynski
ffecf03b2a Update margins to improve grouping
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:48:50 +01:00
Michael Telatynski
4041c030a5 Apply changes from Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 19:03:12 +01:00
Michael Telatynski
3e4e7953ed word-break: break-word;
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 13:40:25 +01:00
Michael Telatynski
b5e6f8b8c1 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 13:34:10 +01:00
Michael Telatynski
5c8ad71a15 add missing assets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:03:49 +01:00
Michael Telatynski
faab35738f Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Zoe
1395cb02ed Fixup alignment 2020-04-06 11:44:46 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
2cf55fb2a0 adjust start options styling 2020-04-03 17:32:09 +02:00
Bruno Windels
c15fa2ba0c
Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
QR code reciprocation
2020-04-03 12:28:41 +00:00
Jorik Schellekens
3ed457ea7d
Merge pull request #4305 from JorikSchellekens/joriks/font-scaling
Make all 'font-size's and 'line-height's rem
2020-04-02 17:40:39 +01:00
Bruno Windels
fffd5a4a5e fix stylelint 2020-04-02 16:46:29 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Michael Telatynski
a28aa4c0b4 Tweak user online dot in room tile, make it occupy same space and inverse behaviour of the context menu button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:13:19 +01:00
Michael Telatynski
3612073852 Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:12:19 +01:00
Jorik Schellekens
202ad9f98a Remove sort and include new scss file in components 2020-04-02 13:42:59 +01:00
Jorik Schellekens
df1a8b288b Change copyright 2020-04-02 13:35:12 +01:00
Bruno Windels
31ca52dede fix stylelint 2020-04-02 13:44:19 +02:00
Bruno Windels
1f65cfb7f6 polish design and disable buttons after click 2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
Michael Telatynski
faa4f54c97 Only apply padding to standard textual buttons (kind buttons)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 00:12:48 +01:00
Michael Telatynski
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
430a9ef948 tweak e2e icon margins
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 15:09:19 +01:00
Michael Telatynski
6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Michael Telatynski
759de88b43 match padding too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:25:48 +01:00
Michael Telatynski
4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
Michael Telatynski
eb901441cd Fix alignment of e2e icon in userinfo and expose full displayname in title
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 16:14:18 +01:00
Jorik Schellekens
e2685b1cf0 Licensing info 2020-03-31 15:29:40 +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
Michael Telatynski
9e8a401dc8 Fix EventListSummary when RR rendering is disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:29:58 +01:00
Travis Ralston
8bc86deaaa Appease the style linter 2020-03-30 20:23:34 -06:00
Travis Ralston
ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC 2020-03-30 20:03:46 -06: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
Travis Ralston
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button
Fix view community link icon contrast
2020-03-30 11:20:49 -06:00
Bruno Windels
eff9db4273 bring back global style rules for thin scrollbars (also FF now!) 2020-03-30 12:41:05 +02:00
Bruno Windels
2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
Bruno Windels
a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
Fix: allow scrolling while window is not focused & remove scrollbar hack
2020-03-27 10:16:53 +00:00
Bruno Windels
4f3842d75e pick color similar to chevron for cancel X button 2020-03-26 16:58:17 +01:00
Bruno Windels
9b54d15fcd add cancel button to verification panel 2020-03-26 16:53:46 +01:00
Zoe
04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00