Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the modal title styling consistent #13669

Merged
merged 1 commit into from
Feb 5, 2019
Merged

Make the modal title styling consistent #13669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/src/modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
}

.components-modal__header-heading {
font-size: 1em;
font-weight: 400;
font-size: 1rem;
font-weight: 600;
}

h1 {
Expand Down
8 changes: 1 addition & 7 deletions packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ const ShortcutSection = ( { title, shortcuts } ) => (
);

export function KeyboardShortcutHelpModal( { isModalActive, toggleModal } ) {
const title = (
<span className="edit-post-keyboard-shortcut-help__title">
jorgefilipecosta marked this conversation as resolved.
Show resolved Hide resolved
{ __( 'Keyboard Shortcuts' ) }
</span>
);

return (
<Fragment>
<KeyboardShortcuts
Expand All @@ -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 }
>
Expand Down
4 changes: 0 additions & 4 deletions packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
.edit-post-keyboard-shortcut-help {
&__title {
font-size: 1rem;
font-weight: 600;
}

&__section {
margin: 0 0 2rem 0;
Expand Down
8 changes: 1 addition & 7 deletions ...es/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-post/src/components/options-modal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> }
jorgefilipecosta marked this conversation as resolved.
Show resolved Hide resolved
title={ __( 'Options' ) }
closeLabel={ __( 'Close' ) }
onRequestClose={ closeModal }
>
Expand Down
5 changes: 0 additions & 5 deletions packages/edit-post/src/components/options-modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
.edit-post-options-modal {
&__title {
font-size: 1rem;
font-weight: 600;
}

&__section {
margin: 0 0 2rem 0;
}
Expand Down
8 changes: 1 addition & 7 deletions packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down