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

Reduce size of UI elements on Settings screen #6500

Merged
merged 3 commits into from
Aug 5, 2021
Merged

Reduce size of UI elements on Settings screen #6500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc6c083
Change settings welcome message buttons to links
delawski Jul 30, 2021
682aa60
Reduce the vertical padding on the Save button bar
delawski Jul 30, 2021
a965bce
Allow period at end of sentence to be translated
westonruter Aug 5, 2021
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
2 changes: 1 addition & 1 deletion assets/src/css/core-components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
width: 100%;

@media screen and (min-width: 783px) {
padding: 30px 90px;
padding: 20px 90px;
}
}

Expand Down
9 changes: 0 additions & 9 deletions assets/src/settings-page/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ html {
}
}

.amp .settings-welcome__button.is-primary {
box-shadow: none;
margin-right: 1rem;
}

.settings-welcome__body h2 {
margin-bottom: 1rem;
}
Expand All @@ -87,10 +82,6 @@ html {
margin: 0;
}

.settings-welcome__body .components-button {
margin-top: 1rem;
}

/* Supported templates section. */
.supported-templates {
margin-bottom: 3rem;
Expand Down
27 changes: 14 additions & 13 deletions assets/src/settings-page/welcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { useContext } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import { __, _x } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -76,19 +76,20 @@ export function Welcome() {
</h2>
<p>
{ __( 'The AMP configuration wizard helps you choose the best configuration settings for your site.', 'amp' ) }
{ ' ' }
<a href={ onboardingWizardLink } >
{ pluginConfigured ? __( 'Reopen Wizard', 'amp' ) : __( 'Open Wizard', 'amp' ) }
</a>
{ customizerLink && templateModeWasOverridden === false && (
<>
{ ` ${ _x( 'or', 'e.g. do this or that', 'amp' ) } ` }
<a href={ customizerLink } >
{ __( 'Customize Reader Theme', 'amp' ) }
</a>
</>
) }
{ _x( '.', 'End of sentence.', 'amp' ) }
</p>

<a className="components-button is-primary settings-welcome__button" href={ onboardingWizardLink } >
{ pluginConfigured ? __( 'Reopen Wizard', 'amp' ) : __( 'Open Wizard', 'amp' ) }
</a>

{
customizerLink && templateModeWasOverridden === false && (
<a className="components-button is-secondary" href={ customizerLink } rel="noreferrer">
{ __( 'Customize Reader Theme', 'amp' ) }
</a>
)
}
</div>
</div>
</div>
Expand Down