Make the modal title styling consistent (#13669)

WordPress · Mar 6, 2019 · 081f39c · 081f39c
1 parent 1a77b44
commit 081f39c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 33 deletions.
diff --git a/packages/components/src/modal/style.scss b/packages/components/src/modal/style.scss
@@ -81,8 +81,8 @@
 	}
 
 	.components-modal__header-heading {
-		font-size: 1em;
-		font-weight: 400;
+		font-size: 1rem;
+		font-weight: 600;
 	}
 
 	h1 {

diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js b/packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js
@@ -69,12 +69,6 @@ const ShortcutSection = ( { title, shortcuts } ) => (
 );
 
 export function KeyboardShortcutHelpModal( { isModalActive, toggleModal } ) {
-	const title = (
-		<span className="edit-post-keyboard-shortcut-help__title">
-			{ __( 'Keyboard Shortcuts' ) }
-		</span>
-	);
-
 	return (
 		<Fragment>
 			<KeyboardShortcuts
@@ -86,7 +80,7 @@ export function KeyboardShortcutHelpModal( { isModalActive, toggleModal } ) {
 			{ isModalActive && (
 				<Modal
 					className="edit-post-keyboard-shortcut-help"
-					title={ title }
+					title={ __( 'Keyboard Shortcuts' ) }
 					closeLabel={ __( 'Close' ) }
 					onRequestClose={ toggleModal }
 				>

diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss b/packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss
@@ -1,8 +1,4 @@
 .edit-post-keyboard-shortcut-help {
-	&__title {
-		font-size: 1rem;
-		font-weight: 600;
-	}
 
 	&__section {
 		margin: 0 0 2rem 0;

diff --git a/...es/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap b/...es/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
@@ -14,13 +14,7 @@ exports[`KeyboardShortcutHelpModal should match snapshot when the modal is activ
     className="edit-post-keyboard-shortcut-help"
     closeLabel="Close"
     onRequestClose={[Function]}
-    title={
-      <span
-        className="edit-post-keyboard-shortcut-help__title"
-      >
-        Keyboard Shortcuts
-      </span>
-    }
+    title="Keyboard Shortcuts"
   >
     <ShortcutSection
       key="0"

diff --git a/packages/edit-post/src/components/options-modal/index.js b/packages/edit-post/src/components/options-modal/index.js
@@ -33,7 +33,7 @@ export function OptionsModal( { isModalActive, isViewable, closeModal } ) {
 	return (
 		<Modal
 			className="edit-post-options-modal"
-			title={ <span className="edit-post-options-modal__title">{ __( 'Options' ) }</span> }
+			title={ __( 'Options' ) }
 			closeLabel={ __( 'Close' ) }
 			onRequestClose={ closeModal }
 		>

diff --git a/packages/edit-post/src/components/options-modal/style.scss b/packages/edit-post/src/components/options-modal/style.scss
@@ -1,9 +1,4 @@
 .edit-post-options-modal {
-	&__title {
-		font-size: 1rem;
-		font-weight: 600;
-	}
-
 	&__section {
 		margin: 0 0 2rem 0;
 	}

diff --git a/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
@@ -4,13 +4,7 @@ exports[`OptionsModal should match snapshot when the modal is active 1`] = `
 <WithInstanceId(Modal)
   className="edit-post-options-modal"
   closeLabel="Close"
-  title={
-    <span
-      className="edit-post-options-modal__title"
-    >
-      Options
-    </span>
-  }
+  title="Options"
 >
   <Section
     title="General"