mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3989 from matrix-org/t3chguy/olympics

Browse source 
Apply the Olympic effect to SAS Emoji Verification
This commit is contained in:
J. Ryan Stinnett 2020-01-30 11:16:14 +00:00 committed by GitHub
commit 1cd2b7d190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/right_panel/_UserInfo.scss
View file

@ -211,7 +211,7 @@ limitations under the License.
padding-bottom: 16px; padding-bottom: 16px;
} }
.mx_UserInfo_scrollContainer:not(.mx_UserInfo_separator) { .mx_UserInfo_container:not(.mx_UserInfo_separator) {
padding-top: 16px; padding-top: 16px;
padding-bottom: 0; padding-bottom: 0;

31
res/css/views/verification/_VerificationShowSas.scss
View file

@ -28,21 +28,38 @@ limitations under the License.
.mx_VerificationShowSas_emojiSas { .mx_VerificationShowSas_emojiSas {
text-align: center; text-align: center;
display: flex;
flex-wrap: wrap;
justify-content: center;
margin: 25px 0;
} }
.mx_VerificationShowSas_emojiSas_block { .mx_VerificationShowSas_emojiSas_block {
display: inline-block; display: inline-block;
margin-left: 15px; margin-bottom: 30px;
margin-right: 15px; position: relative;
text-align: center; // allow the blocks to grow to space themselves evenly up to a limit of 100px
margin-bottom: 20px; flex-grow: 1;
max-width: 100px;
} }
.mx_VerificationShowSas_emojiSas_emoji { .mx_VerificationShowSas_emojiSas_emoji {
font-size: 48px; font-size: 48px;
} }
.mx_VerificationShowSas_emojiSas_label { .mx_UserInfo .mx_VerificationShowSas_emojiSas_emoji {
text-align: center; font-size: 32px; // in UserInfo use a smaller font-size to fit in a smaller space
font-weight: bold; }
.mx_VerificationShowSas_emojiSas_label {
font-weight: bold;
// allow the text to overflow the parent by 15px on each side
// this is to keep the width of the parent consistent for spacing centrally via flexbox
position: absolute;
left: -15px;
right: -15px;
}
.mx_VerificationShowSas_emojiSas_break {
flex-basis: 100%;
} }

6
src/components/views/verification/VerificationShowSas.js
View file

@ -62,7 +62,9 @@ export default class VerificationShowSas extends React.Component {
</div>, </div>,
); );
sasDisplay = <div className="mx_VerificationShowSas_emojiSas"> sasDisplay = <div className="mx_VerificationShowSas_emojiSas">
{emojiBlocks} {emojiBlocks.slice(0, 4)}
<div className="mx_VerificationShowSas_emojiSas_break" />
{emojiBlocks.slice(4)}
</div>; </div>;
sasCaption = _t( sasCaption = _t(
"Verify this user by confirming the following emoji appear on their screen.", "Verify this user by confirming the following emoji appear on their screen.",
@ -105,8 +107,8 @@ export default class VerificationShowSas extends React.Component {
return <div className="mx_VerificationShowSas"> return <div className="mx_VerificationShowSas">
<p>{sasCaption}</p> <p>{sasCaption}</p>
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{sasDisplay} {sasDisplay}
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{confirm} {confirm}
</div>; </div>;
} }