Make buttons more consisten.

WordPress · Jul 8, 2024 · c91deb1 · c91deb1
1 parent 86756df
commit c91deb1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/settings/src/components/password.js b/settings/src/components/password.js
@@ -131,7 +131,6 @@ export default function Password() {
 					label="New Password"
 					size="62"
 					value={ editedRecord.password ?? '' }
-					placeholder="Enter New Password..."
 					onChange={ handlePasswordChange }
 				/>
 				<Button

diff --git a/settings/src/components/totp.js b/settings/src/components/totp.js
@@ -455,7 +455,7 @@ function ConfirmDisableApp( { onConfirm, onClose, disabling } ) {
 			) : (
 				<div className="wporg-2fa__submit-actions">
 					<Button variant="primary" isDestructive onClick={ onConfirm }>
-						Disable
+						Disable Two-Factor app
 					</Button>
 
 					<Button variant="tertiary" onClick={ onClose }>

diff --git a/settings/src/components/webauthn/list-keys.js b/settings/src/components/webauthn/list-keys.js
@@ -114,10 +114,10 @@ function ConfirmRemoveKey( { keyToRemove, onConfirm, onClose, deleting, error }
 			) : (
 				<div className="wporg-2fa__submit-actions">
 					<Button variant="primary" isDestructive onClick={ onConfirm }>
-						Delete
+						Delete key
 					</Button>
 
-					<Button variant="tertiary" onClick={ onClose }>
+					<Button variant="secondary" onClick={ onClose }>
 						Cancel
 					</Button>
 				</div>

diff --git a/settings/src/components/webauthn/webauthn.js b/settings/src/components/webauthn/webauthn.js
@@ -133,7 +133,7 @@ export default function WebAuthn() {
 
 						{ keys.length > 0 && (
 							<Button
-								variant="tertiary"
+								variant="secondary"
 								onClick={
 									webAuthnEnabled ? showConfirmDisableModal : toggleProvider
 								}
@@ -191,10 +191,10 @@ function ConfirmDisableKeys( { onConfirm, onClose, disabling } ) {
 			) : (
 				<div className="wporg-2fa__submit-actions">
 					<Button variant="primary" isDestructive onClick={ onConfirm }>
-						Disable
+						Disable security keys
 					</Button>
 
-					<Button variant="tertiary" onClick={ onClose }>
+					<Button variant="secondary" onClick={ onClose }>
 						Cancel
 					</Button>
 				</div>

diff --git a/settings/src/components/webauthn/webauthn.scss b/settings/src/components/webauthn/webauthn.scss
@@ -2,12 +2,13 @@
 .bbp-single-user .wporg-2fa__webauthn {
 	.wporg-2fa__webauthn-keys-header {
 		margin-bottom: 0;
+		font-weight: 600;
 	}
 
 	.wporg-2fa__webauthn-keys-list {
 		li {
 			display: flex;
-			padding: 20px 0;
+			padding: 16px 0;
 			border-bottom: 1px solid $gray-300;
 
 			&:last-of-type {
@@ -20,10 +21,6 @@
 			font-size: 13px;
 		}
 	}
-
-	.wporg-2fa__webauthn-register {
-		min-height: 300px;
-	}
 }
 
 .components-modal__frame.wporg-2fa__confirm-delete-key {