Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 3f67819

Browse files
t3chguyt3chguy
authored
Merge pull request #41 from element-hq/t3chguy/wat/230.1
2 parents ad94c39 + e6404da commit 3f67819

File tree

48 files changed

+121
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+121
-107
lines changed

‎res/css/views/auth/_AuthBody.pcss

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Please see LICENSE files in the repository root for full details.
1616
padding: 25px 60px;
1717
box-sizing: border-box;
1818

19-
b {
19+
strong {
2020
font-weight: var(--cpd-font-weight-semibold);
2121
}
2222

‎src/IdentityAuthClient.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default class IdentityAuthClient {
141141
"terms|identity_server_no_terms_description_1",
142142
{},
143143
{
144-
server: () => <b>{abbreviateUrl(identityServerUrl)}</b>,
144+
server: () => <strong>{abbreviateUrl(identityServerUrl)}</strong>,
145145
},
146146
)}
147147
</p>

‎src/RoomInvite.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export function showAnyInviteErrors(
145145
"invite|room_failed_partial",
146146
{},
147147
{
148-
RoomName: () => <b>{room.name}</b>,
148+
RoomName: () => <strong>{room.name}</strong>,
149149
},
150150
)}
151151
</h4>

‎src/components/structures/auth/forgot-password/CheckEmail.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const CheckEmail: React.FC<CheckEmailProps> = ({
4646
<EMailPromptIcon className="mx_AuthBody_emailPromptIcon--shifted" />
4747
<h1>{_t("auth|uia|email_auth_header")}</h1>
4848
<div className="mx_AuthBody_text">
49-
<p>{_t("auth|check_email_explainer", { email: email }, { b: (t) => <b>{t}</b> })}</p>
49+
<p>{_t("auth|check_email_explainer", { email: email }, { b: (t) => <strong>{t}</strong> })}</p>
5050
<div className="mx_AuthBody_did-not-receive">
5151
<span className="mx_VerifyEMailDialog_text-light">{_t("auth|check_email_wrong_email_prompt")}</span>
5252
<AccessibleButton className="mx_AuthBody_resend-button" kind="link" onClick={onReEnterEmailClick}>

‎src/components/structures/auth/forgot-password/EnterEmail.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const EnterEmail: React.FC<EnterEmailProps> = ({
5757
<EmailIcon className="mx_AuthBody_icon" />
5858
<h1>{_t("auth|enter_email_heading")}</h1>
5959
<p className="mx_AuthBody_text">
60-
{_t("auth|enter_email_explainer", { homeserver }, { b: (t) => <b>{t}</b> })}
60+
{_t("auth|enter_email_explainer", { homeserver }, { b: (t) => <strong>{t}</strong> })}
6161
</p>
6262
<form onSubmit={onSubmit}>
6363
<fieldset disabled={loading}>

‎src/components/structures/auth/forgot-password/VerifyEmailModal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const VerifyEmailModal: React.FC<Props> = ({
5050
email,
5151
},
5252
{
53-
b: (sub) => <b>{sub}</b>,
53+
b: (sub) => <strong>{sub}</strong>,
5454
},
5555
)}
5656
</p>

‎src/components/views/auth/InteractiveAuthEntryComponents.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ export class EmailIdentityAuthEntry extends React.Component<
468468
/>
469469
<p>
470470
{_t("auth|uia|email", {
471-
emailAddress: <b>{this.props.inputs.emailAddress}</b>,
471+
emailAddress: <strong>{this.props.inputs.emailAddress}</strong>,
472472
})}
473473
</p>
474474
{this.state.requesting ? (

‎src/components/views/auth/LoginWithQRFlow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ export default class LoginWithQRFlow extends React.Component<XOR<Props, MSC3906P
293293
</li>
294294
<li>
295295
{_t("auth|qr_code_login|select_qr_code", {
296-
scanQRCode: <b>{_t("auth|qr_code_login|scan_qr_code")}</b>,
296+
scanQRCode: <strong>{_t("auth|qr_code_login|scan_qr_code")}</strong>,
297297
})}
298298
</li>
299299
<li>{_t("auth|qr_code_login|point_the_camera")}</li>

‎src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export const AnalyticsLearnMoreDialog: React.FC<IProps> = ({
7272
{_t("analytics|pseudonymous_usage_data", { analyticsOwner })}
7373
</div>
7474
<ul className="mx_AnalyticsLearnMore_bullets">
75-
<li>{_t("analytics|bullet_1", {}, { Bold: (sub) => <b>{sub}</b> })}</li>
76-
<li>{_t("analytics|bullet_2", {}, { Bold: (sub) => <b>{sub}</b> })}</li>
75+
<li>{_t("analytics|bullet_1", {}, { Bold: (sub) => <strong>{sub}</strong> })}</li>
76+
<li>{_t("analytics|bullet_2", {}, { Bold: (sub) => <strong>{sub}</strong> })}</li>
7777
<li>{_t("analytics|disable_prompt")}</li>
7878
</ul>
7979
{privacyPolicyLink}

‎src/components/views/dialogs/BugReportDialog.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
205205
) {
206206
warning = (
207207
<p>
208-
<b>{_t("bug_reporting|unsupported_browser")}</b>
208+
<strong>{_t("bug_reporting|unsupported_browser")}</strong>
209209
</p>
210210
);
211211
}
@@ -221,7 +221,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
221221
{warning}
222222
<p>{_t("bug_reporting|description")}</p>
223223
<p>
224-
<b>
224+
<strong>
225225
{_t(
226226
"bug_reporting|before_submitting",
227227
{},
@@ -237,7 +237,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
237237
),
238238
},
239239
)}
240-
</b>
240+
</strong>
241241
</p>
242242

243243
<div className="mx_BugReportDialog_download">

‎src/components/views/dialogs/CreateRoomDialog.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
280280
"create_room|join_rule_restricted_label",
281281
{},
282282
{
283-
SpaceName: () => <b>{this.props.parentSpace?.name ?? _t("common|unnamed_space")}</b>,
283+
SpaceName: () => (
284+
<strong>{this.props.parentSpace?.name ?? _t("common|unnamed_space")}</strong>
285+
),
284286
},
285287
)}
286288
&nbsp;
@@ -294,7 +296,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
294296
"create_room|join_rule_public_parent_space_label",
295297
{},
296298
{
297-
SpaceName: () => <b>{this.props.parentSpace?.name ?? _t("common|unnamed_space")}</b>,
299+
SpaceName: () => (
300+
<strong>{this.props.parentSpace?.name ?? _t("common|unnamed_space")}</strong>
301+
),
298302
},
299303
)}
300304
&nbsp;

‎src/components/views/dialogs/CreateSubspaceDialog.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const CreateSubspaceDialog: React.FC<IProps> = ({ space, onAddExistingSpaceClick
9595
"create_space|subspace_join_rule_restricted_description",
9696
{},
9797
{
98-
SpaceName: () => <b>{parentSpace.name}</b>,
98+
SpaceName: () => <strong>{parentSpace.name}</strong>,
9999
},
100100
)}
101101
</p>
@@ -107,7 +107,7 @@ const CreateSubspaceDialog: React.FC<IProps> = ({ space, onAddExistingSpaceClick
107107
"create_space|subspace_join_rule_public_description",
108108
{},
109109
{
110-
SpaceName: () => <b>{parentSpace.name}</b>,
110+
SpaceName: () => <strong>{parentSpace.name}</strong>,
111111
},
112112
)}
113113
</p>

‎src/components/views/dialogs/LeaveSpaceDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
7777
"space|leave_dialog_description",
7878
{},
7979
{
80-
spaceName: () => <b>{space.name}</b>,
80+
spaceName: () => <strong>{space.name}</strong>,
8181
},
8282
)}
8383
&nbsp;

‎src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const ManageRestrictedJoinRuleDialog: React.FC<IProps> = ({ room, selected = [],
144144
"room_settings|security|join_rule_restricted_dialog_description",
145145
{},
146146
{
147-
RoomName: () => <b>{room.name}</b>,
147+
RoomName: () => <strong>{room.name}</strong>,
148148
},
149149
)}
150150
</p>

‎src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function ManualDeviceKeyVerificationDialog({
6969
<label>{_t("encryption|verification|manual_device_verification_device_key_label")}:</label>{" "}
7070
<span>
7171
<code>
72-
<b>{key}</b>
72+
<strong>{key}</strong>
7373
</code>
7474
</span>
7575
</li>

‎src/components/views/dialogs/RegistrationEmailPromptDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const RegistrationEmailPromptDialog: React.FC<IProps> = ({ onFinished }) => {
5454
"auth|registration|continue_without_email_description",
5555
{},
5656
{
57-
b: (sub) => <b>{sub}</b>,
57+
b: (sub) => <strong>{sub}</strong>,
5858
},
5959
)}
6060
</p>

‎src/components/views/dialogs/RoomUpgradeWarningDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export default class RoomUpgradeWarningDialog extends React.Component<IProps, IS
181181
"room_settings|advanced|upgrade_warning_dialog_explainer",
182182
{},
183183
{
184-
b: (sub) => <b>{sub}</b>,
184+
b: (sub) => <strong>{sub}</strong>,
185185
},
186186
)}
187187
</p>

‎src/components/views/dialogs/UploadFailureDialog.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default class UploadFailureDialog extends React.Component<IProps> {
4646
sizeOfThisFile: fileSize(this.props.badFiles[0].size),
4747
},
4848
{
49-
b: (sub) => <b>{sub}</b>,
49+
b: (sub) => <strong>{sub}</strong>,
5050
},
5151
);
5252
buttons = (
@@ -64,7 +64,7 @@ export default class UploadFailureDialog extends React.Component<IProps> {
6464
limit: fileSize(this.props.contentMessages.getUploadLimit()!),
6565
},
6666
{
67-
b: (sub) => <b>{sub}</b>,
67+
b: (sub) => <strong>{sub}</strong>,
6868
},
6969
);
7070
buttons = (
@@ -82,7 +82,7 @@ export default class UploadFailureDialog extends React.Component<IProps> {
8282
limit: fileSize(this.props.contentMessages.getUploadLimit()!),
8383
},
8484
{
85-
b: (sub) => <b>{sub}</b>,
85+
b: (sub) => <strong>{sub}</strong>,
8686
},
8787
);
8888
const howManyOthers = this.props.totalFiles - this.props.badFiles.length;

‎src/components/views/dialogs/devtools/SettingExplorer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const EditSetting: React.FC<IEditSettingProps> = ({ setting, onBack }) => {
128128
</h3>
129129

130130
<div className="mx_DevTools_SettingsExplorer_warning">
131-
<b>{_t("devtools|caution_colon")}</b> {_t("devtools|use_at_own_risk")}
131+
<strong>{_t("devtools|caution_colon")}</strong> {_t("devtools|use_at_own_risk")}
132132
</div>
133133

134134
<div>

‎src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,9 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
405405
title = _t("restore_key_backup_dialog|enter_phrase_title");
406406
content = (
407407
<div>
408-
<p>{_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => <b>{sub}</b> })}</p>
408+
<p>
409+
{_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => <strong>{sub}</strong> })}
410+
</p>
409411
<p>{_t("restore_key_backup_dialog|enter_phrase_description")}</p>
410412

411413
<form className="mx_RestoreKeyBackupDialog_primaryContainer">
@@ -467,7 +469,9 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
467469

468470
content = (
469471
<div>
470-
<p>{_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => <b>{sub}</b> })}</p>
472+
<p>
473+
{_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => <strong>{sub}</strong> })}
474+
</p>
471475
<p>{_t("restore_key_backup_dialog|enter_key_description")}</p>
472476

473477
<div className="mx_RestoreKeyBackupDialog_primaryContainer">

‎src/components/views/rooms/NewRoomIntro.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const NewRoomIntro: React.FC = () => {
9797
introMessage,
9898
{},
9999
{
100-
displayName: () => <b>{displayName}</b>,
100+
displayName: () => <strong>{displayName}</strong>,
101101
},
102102
)}
103103
</p>
@@ -241,7 +241,7 @@ const NewRoomIntro: React.FC = () => {
241241
"room|intro|start_of_room",
242242
{},
243243
{
244-
roomName: () => <b>{room.name}</b>,
244+
roomName: () => <strong>{room.name}</strong>,
245245
},
246246
)}
247247
</p>

‎src/components/views/rooms/RoomPreviewCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
9595
"room|invites_you_text",
9696
{},
9797
{
98-
inviter: () => <b>{inviter?.name || inviteSender}</b>,
98+
inviter: () => <strong>{inviter?.name || inviteSender}</strong>,
9999
},
100100
)}
101101
</div>

‎src/components/views/rooms/RoomSearchAuxPanel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const RoomSearchAuxPanel: React.FC<Props> = ({ searchInfo, isRoomEncrypted, onSe
3838
_t(
3939
"room|search|summary",
4040
{ count: searchInfo.count },
41-
{ query: () => <b>{searchInfo.term}</b> },
41+
{ query: () => <strong>{searchInfo.term}</strong> },
4242
)
4343
) : (
4444
<InlineSpinner />

‎src/components/views/rooms/RoomUpgradeWarningBar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, I
6969
"room_settings|advanced|room_upgrade_warning",
7070
{},
7171
{
72-
b: (sub) => <b>{sub}</b>,
72+
b: (sub) => <strong>{sub}</strong>,
7373
i: (sub) => <i>{sub}</i>,
7474
},
7575
)}

‎src/components/views/settings/CryptographyPanel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default class CryptographyPanel extends React.Component<IProps, IState> {
108108
<th scope="row">{_t("settings|security|session_key")}</th>
109109
<td>
110110
<code>
111-
<b>{identityKey}</b>
111+
<strong>{identityKey}</strong>
112112
</code>
113113
</td>
114114
</tr>

‎src/components/views/settings/JoinRuleSettings.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
281281
"room_settings|security|join_rule_restricted_description_active_space",
282282
{},
283283
{
284-
spaceName: () => <b>{SpaceStore.instance.activeSpaceRoom!.name}</b>,
284+
spaceName: () => <strong>{SpaceStore.instance.activeSpaceRoom!.name}</strong>,
285285
},
286286
);
287287
} else {
@@ -349,7 +349,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
349349
(roomId) => !cli.getRoom(roomId)?.currentState.maySendStateEvent(EventType.SpaceChild, userId),
350350
);
351351
if (unableToUpdateSomeParents) {
352-
warning = <b>{_t("room_settings|security|join_rule_restricted_upgrade_warning")}</b>;
352+
warning = <strong>{_t("room_settings|security|join_rule_restricted_upgrade_warning")}</strong>;
353353
}
354354

355355
upgradeRequiredDialog(

‎src/components/views/settings/SecureBackupPanel.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
259259
statusDescription = (
260260
<>
261261
<SettingsSubsectionText>
262-
{_t("settings|security|key_backup_inactive", {}, { b: (sub) => <b>{sub}</b> })}
262+
{_t("settings|security|key_backup_inactive", {}, { b: (sub) => <strong>{sub}</strong> })}
263263
</SettingsSubsectionText>
264264
<SettingsSubsectionText>
265265
{_t("settings|security|key_backup_connect_prompt")}
@@ -336,7 +336,11 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
336336
statusDescription = (
337337
<>
338338
<SettingsSubsectionText>
339-
{_t("settings|security|key_backup_inactive_warning", {}, { b: (sub) => <b>{sub}</b> })}
339+
{_t(
340+
"settings|security|key_backup_inactive_warning",
341+
{},
342+
{ b: (sub) => <strong>{sub}</strong> },
343+
)}
340344
</SettingsSubsectionText>
341345
<SettingsSubsectionText>{_t("encryption|setup_secure_backup|explainer")}</SettingsSubsectionText>
342346
</>

0 commit comments

Comments
 (0)