Commit graph

1042 commits

Author SHA1 Message Date
rtestard
153703426a I have removed the newline at the end of file to pass tests 2020-02-04 16:02:49 +01:00
rtestard
f023bcfd63 I have modified padlocks styling when the left panel is collapsed 2020-02-04 15:05:26 +01:00
J. Ryan Stinnett
ffc3cdf7b5 Tweak emoji sizes 2020-02-01 13:49:11 +01:00
David Baker
9d343a4705
Merge pull request #4018 from matrix-org/dbkr/truncate_sas
Truncate SAS emoji labels to fit
2020-01-31 16:23:50 +00:00
David Baker
29024c5172 Truncate SAS emoji labels to fit
This keeps the layout of the emoji fixed as much as possible.

Other changes:
 * Fix width of each emoji container to static 52px
 * Bump minimum width of right panel from 250px to 264px to match the
   width in the figma
 * Use normal font-weight for labels as per design
 * Smaller vertical gap between emojis, again to match design
2020-01-31 15:28:58 +00:00
David Baker
2dbceca8b3 Fix size of invite only icon
So it doesn't become tiny with long room names

Fixes https://github.com/vector-im/riot-web/issues/12168
2020-01-31 13:46:42 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco
Add shields to member list, move power label to text
2020-01-31 10:20:13 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events
Make encryption events into bubble-style tiles
2020-01-31 10:20:03 +00:00
J. Ryan Stinnett
31476737ea Enforce a max width on power labels 2020-01-31 10:11:34 +00:00
J. Ryan Stinnett
6f6d6b096a Ensure QR code, verified hero are centered 2020-01-30 22:43:14 +00:00
J. Ryan Stinnett
3ef7e5113b Move power label to right of name
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
5933bd15b1 Remove strange size change on member hover
Unclear why this is here, but removing as it feels quite glitchy, esp on
matrix.org where there's no second line to print.
2020-01-30 21:46:49 +00:00
J. Ryan Stinnett
57c4293fc6 Add verification status icons to room members
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 21:38:40 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
J. Ryan Stinnett
bae35c0859 Change power icon to label instead 2020-01-30 16:40:25 +00:00
David Baker
77618d30fd Actually this is green because it's a link
not because the things were verified. Use the linkButton class
2020-01-30 16:08:42 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
Michael Telatynski
ea0fafc4e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics 2020-01-29 22:55:02 +00:00
Michael Telatynski
afecaa1662 fix left margins in UserInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:54:56 +00:00
Michael Telatynski
d17a2ff80c clean up unused CSS rules
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:54:45 +00:00
Michael Telatynski
33ec73095e Apply the Olympic effect to SAS Emoji Verification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:44:49 +00:00
Michael Telatynski
a180dddc66 Pass an ID to the <Field/> as needed and fix div inside p nesting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:31:19 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more
Replace Verify button in UserInfo verification with "Learn more"
2020-01-29 15:27:46 +00:00
J. Ryan Stinnett
6d47f9620f Adjust icons with in person with design 2020-01-29 14:28:19 +00:00
Michael Telatynski
00dd1a4a8f Re-use existing classes to fix font-size matching
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:22:20 +00:00
Michael Telatynski
19e7c768b6 Replace Verify button in UserInfo verification with "Learn more"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:11:50 +00:00
Michael Telatynski
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration
Right Panel Verification improvements
2020-01-29 09:46:24 +00:00
Michael Telatynski
61d0021c8e Fix styling special case for DialogButtons 2020-01-29 07:58:43 +00:00
Michael Telatynski
2fbda42374 Fix buttons in right panel verif 2020-01-29 07:53:06 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration
Cross Signing Right Panel Verification Decoration
2020-01-28 23:57:48 +00:00
Michael Telatynski
2fb6e73794 speed up user info verification css transitions by 2x 2020-01-28 23:43:27 +00:00
David Baker
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap
Start new key backup in security setup flow
2020-01-28 22:02:20 +00:00
J. Ryan Stinnett
463bddb7e9
Merge pull request #3958 from mstange/fix-unread-scroll-button-hittarget-and-alignment
Tweak styling of the unread indicator circle.
2020-01-28 21:53:50 +00:00
David Baker
39c8a9d204 Start new key backup in security setup flow
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Michael Telatynski
76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 2020-01-28 17:19:59 +00:00
Half-Shot
bfaa9d56fb prefixes 2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684 Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 16:01:50 +00:00
Half-Shot
85bcad0ea0 Styling for Nad 2020-01-28 14:46:22 +00:00
Markus Stange
9821e25e0b Tweak styling of unread indicator circle.
This makes the element symmetric and reduces the size of the hit target.
With the previous styling, the mid-circle glyph was sometimes offset from the center.
Furthermore, the large font size increased the hit box of the ::after element, eating into the scroll up arrow button's hit target.
It might be a good idea to give the ::after element pointer-events:none so that the scroll up button is clickable in its entirety.

Signed-off-by: Markus Stange <mstange@themasta.com>
2020-01-28 15:35:34 +01:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2
Add new session verification details dialog
2020-01-28 11:50:03 +00:00
Half-Shot
7c0a461cbb Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 11:22:02 +00:00
Half-Shot
785277d4b8 Review bits for travis 2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +00:00
J. Ryan Stinnett
d014c5239b Add new session verification details dialog
This gives more info on the session you're about to verify, including device
name and ID.

Fixes https://github.com/vector-im/riot-web/issues/11977
2020-01-27 23:16:26 +00:00
J. Ryan Stinnett
89f110f60a Add separate component for post-auth security flows
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
2020-01-27 22:28:07 +00:00
Michael Telatynski
ca5d4d88a2 Style the QR code 2020-01-27 17:17:05 +00:00
Michael Telatynski
ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
Half-Shot
c0d1298c4f Factor out into BridgeTile 2020-01-27 14:05:22 +00:00
Half-Shot
c9a0e93a74 tidy up borders 2020-01-27 11:14:32 +00:00
David Baker
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup
Setup flow for cross-signing on login / registration
2020-01-25 12:40:17 +00:00