diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index 459622b277..ba74d46eaf 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -30,11 +30,15 @@ limitations under the License. right: 14px; } - .mx_VerificationPanel_verified_section .mx_E2EIcon { - // Override general user info margin - margin: 0 auto !important; + .mx_VerificationPanel_verified_section, + .mx_VerificationPanel_reciprocate_section { + .mx_E2EIcon { + // Override general user info margin + margin: 20px auto !important; + } } + .mx_VerificationPanel_qrCode { padding: 4px 4px 0 4px; background: white; @@ -51,6 +55,16 @@ limitations under the License. max-width: 240px; } } + + .mx_VerificationPanel_reciprocate_section { + .mx_FormButton { + width: 100%; + box-sizing: border-box; + padding: 10px; + display: block; + margin: 10px 0; + } + } } // Special case styling for EncryptionPanel in a Modal dialog diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js index c640c73055..e2dd1f0408 100644 --- a/src/components/views/right_panel/VerificationPanel.js +++ b/src/components/views/right_panel/VerificationPanel.js @@ -156,13 +156,13 @@ export default class VerificationPanel extends React.PureComponent { displayName: member.displayName || member.name || member.userId, })}

-

-

+ + ; } else { body =

; } - return
+ return

{_t("Verify by scanning")}

{ body }
; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 50dc06ce8b..26dcfb7ee8 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1252,7 +1252,7 @@ "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.", "Verify by comparing unique emoji.": "Verify by comparing unique emoji.", "Verify by emoji": "Verify by emoji", - "Almost there! Is %(displayName)s show the same shield?": "Almost there! Is %(displayName)s show the same shield?", + "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?", "No": "No", "Yes": "Yes", "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",