Refine styles of controls to match Compound (#12299)
This changes the styles of buttons, other form controls, and tabs in settings to: 1. Improve their usage of semantic colors, so that they adapt correctly to custom themes 2. Make them more visually coherent with the new Compound design system, as we integrate more of it into the app This is a re-introduction of https://github.com/matrix-org/matrix-react-sdk/pull/12241 with the difference that we're now using our branding colors again on form colors, and buttons have become rounded to match the appearance of new Compound buttons.
This commit is contained in:
parent
5c8b14c53e
commit
6eafe0e5a8
119 changed files with 225 additions and 201 deletions
|
@ -65,7 +65,7 @@ const FacePile: FC<IProps> = ({
|
|||
);
|
||||
|
||||
const content = (
|
||||
<AccessibleButton className="mx_FacePile" kind="link_inline" onClick={props.onClick ?? null}>
|
||||
<AccessibleButton className="mx_FacePile" onClick={props.onClick ?? null}>
|
||||
<AvatarStack>{pileContents}</AvatarStack>
|
||||
{children}
|
||||
</AccessibleButton>
|
||||
|
|
|
@ -225,7 +225,11 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
|
|||
if (this.state.canSetName || this.state.canSetTopic || this.state.canSetAvatar) {
|
||||
profileSettingsButtons = (
|
||||
<div className="mx_ProfileSettings_buttons">
|
||||
<AccessibleButton onClick={this.cancelProfileChanges} kind="link" disabled={!this.isSaveEnabled()}>
|
||||
<AccessibleButton
|
||||
onClick={this.cancelProfileChanges}
|
||||
kind="primary_outline"
|
||||
disabled={!this.isSaveEnabled()}
|
||||
>
|
||||
{_t("action|cancel")}
|
||||
</AccessibleButton>
|
||||
<AccessibleButton onClick={this.saveProfile} kind="primary" disabled={!this.isSaveEnabled()}>
|
||||
|
|
|
@ -235,7 +235,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
|
|||
buttonCaption = _t("encryption|verify_toast_title");
|
||||
}
|
||||
actions.push(
|
||||
<AccessibleButton key="setup" kind="primary" onClick={this.onBootstrapClick}>
|
||||
<AccessibleButton key="setup" kind="primary_outline" onClick={this.onBootstrapClick}>
|
||||
{buttonCaption}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
@ -243,7 +243,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
|
|||
|
||||
if (keysExistAnywhere) {
|
||||
actions.push(
|
||||
<AccessibleButton key="reset" kind="danger" onClick={this.onResetCrossSigningClick}>
|
||||
<AccessibleButton key="reset" kind="danger_outline" onClick={this.onResetCrossSigningClick}>
|
||||
{_t("action|reset")}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
|
|
@ -51,10 +51,10 @@ export default class CryptographyPanel extends React.Component<IProps, IState> {
|
|||
if (client.isCryptoEnabled()) {
|
||||
importExportButtons = (
|
||||
<div className="mx_CryptographyPanel_importExportButtons">
|
||||
<AccessibleButton kind="primary" onClick={this.onExportE2eKeysClicked}>
|
||||
<AccessibleButton kind="primary_outline" onClick={this.onExportE2eKeysClicked}>
|
||||
{_t("settings|security|export_megolm_keys")}
|
||||
</AccessibleButton>
|
||||
<AccessibleButton kind="primary" onClick={this.onImportE2eKeysClicked}>
|
||||
<AccessibleButton kind="primary_outline" onClick={this.onImportE2eKeysClicked}>
|
||||
{_t("settings|security|import_megolm_keys")}
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
|
|
|
@ -209,7 +209,7 @@ export default class ProfileSettings extends React.Component<{}, IState> {
|
|||
<div className="mx_ProfileSettings_buttons">
|
||||
<AccessibleButton
|
||||
onClick={this.cancelProfileChanges}
|
||||
kind="link"
|
||||
kind="primary_outline"
|
||||
disabled={!this.state.enableProfileSave}
|
||||
>
|
||||
{_t("action|cancel")}
|
||||
|
|
|
@ -328,14 +328,14 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
|
|||
);
|
||||
|
||||
actions.push(
|
||||
<AccessibleButton key="restore" kind="primary" onClick={this.restoreBackup}>
|
||||
<AccessibleButton key="restore" kind="primary_outline" onClick={this.restoreBackup}>
|
||||
{restoreButtonCaption}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
||||
if (!isSecureBackupRequired(MatrixClientPeg.safeGet())) {
|
||||
actions.push(
|
||||
<AccessibleButton key="delete" kind="danger" onClick={this.deleteBackup}>
|
||||
<AccessibleButton key="delete" kind="danger_outline" onClick={this.deleteBackup}>
|
||||
{_t("settings|security|delete_backup")}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
@ -350,7 +350,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
|
|||
</>
|
||||
);
|
||||
actions.push(
|
||||
<AccessibleButton key="setup" kind="primary" onClick={this.startNewBackup}>
|
||||
<AccessibleButton key="setup" kind="primary_outline" onClick={this.startNewBackup}>
|
||||
{_t("encryption|setup_secure_backup|title")}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
@ -358,7 +358,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
|
|||
|
||||
if (secretStorageKeyInAccount) {
|
||||
actions.push(
|
||||
<AccessibleButton key="reset" kind="danger" onClick={this.resetSecretStorage}>
|
||||
<AccessibleButton key="reset" kind="danger_outline" onClick={this.resetSecretStorage}>
|
||||
{_t("action|reset")}
|
||||
</AccessibleButton>,
|
||||
);
|
||||
|
|
|
@ -85,7 +85,7 @@ const UpdateCheckButton: React.FC = () => {
|
|||
|
||||
return (
|
||||
<React.Fragment>
|
||||
<AccessibleButton onClick={onCheckForUpdateClick} kind="primary" disabled={busy}>
|
||||
<AccessibleButton onClick={onCheckForUpdateClick} kind="primary_outline" disabled={busy}>
|
||||
{_t("update|check_action")}
|
||||
</AccessibleButton>
|
||||
{suffix}
|
||||
|
|
|
@ -240,7 +240,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
|
|||
</>
|
||||
}
|
||||
>
|
||||
<AccessibleButton onClick={this.onBugReport} kind="primary">
|
||||
<AccessibleButton onClick={this.onBugReport} kind="primary_outline">
|
||||
{_t("bug_reporting|submit_debug_logs")}
|
||||
</AccessibleButton>
|
||||
<SettingsSubsectionText>
|
||||
|
@ -316,7 +316,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
|
|||
</CopyableText>
|
||||
</details>
|
||||
</SettingsSubsectionText>
|
||||
<AccessibleButton onClick={this.onClearCacheAndReload} kind="danger">
|
||||
<AccessibleButton onClick={this.onClearCacheAndReload} kind="danger_outline">
|
||||
{_t("setting|help_about|clear_cache_reload")}
|
||||
</AccessibleButton>
|
||||
</SettingsSubsection>
|
||||
|
|
|
@ -256,14 +256,14 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
|
|||
<div className="mx_SecurityUserSettingsTab_bulkOptions">
|
||||
<AccessibleButton
|
||||
onClick={this.onAcceptAllInvitesClicked}
|
||||
kind="primary"
|
||||
kind="primary_outline"
|
||||
disabled={this.state.managingInvites}
|
||||
>
|
||||
{_t("settings|security|bulk_options_accept_all_invites", { invitedRooms: invitedRoomIds.size })}
|
||||
</AccessibleButton>
|
||||
<AccessibleButton
|
||||
onClick={this.onRejectAllInvitesClicked}
|
||||
kind="danger"
|
||||
kind="danger_outline"
|
||||
disabled={this.state.managingInvites}
|
||||
>
|
||||
{_t("settings|security|bulk_options_reject_all_invites", { invitedRooms: invitedRoomIds.size })}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue