Skip to content

Settings: fixes remaining font size and spacing issues #6377

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

Merged
merged 1 commit into from
Feb 13, 2017
Merged

Settings: fixes remaining font size and spacing issues #6377

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
38 changes: 23 additions & 15 deletions _inc/client/components/forms/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,12 @@
}
}

.jp-form-setting-explanation {
color: darken( $gray, 20% );
display: block;
margin: rem( 5px ) rem( 14px ) 0 0;
font-size: rem( 13px );
font-style: italic;
font-weight: 400;
word-break: break-word;

+ .dops-card {
margin-top: rem( 16px );
}
}

.jp-form-settings-group {
p {
font-size: rem( 15px );
margin-top: 0;
margin-bottom: rem( 24px );
}
.form-toggle__label {
display: block;
margin-top: 4px;
Expand All @@ -54,6 +45,19 @@
float: left;
margin-top: 2px;
}
.jp-form-setting-explanation {
color: darken( $gray, 20% );
display: block;
margin: rem( 5px ) rem( 14px ) 0 0;
font-size: rem( 13px );
font-style: italic;
font-weight: 400;
word-break: break-word;

+ .dops-card {
margin-top: rem( 16px );
}
}
}

.jp-form-toggle-explanation {
Expand All @@ -77,7 +81,11 @@
.jp-form-input-with-prefix {
display: inline-flex;
width: 100%;
margin-bottom: rem( 24px );
margin-top: rem( 24px );

&:first-of-type {
margin-top: 0;
}

span:first-child {
min-width: rem( 60px );
Expand Down
9 changes: 2 additions & 7 deletions _inc/client/security/backups-scan.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,11 @@ export const BackupsScan = moduleSettingsForm(
__( 'Your site is backed up and threat-free.' )
}
</p>
<p className="jp-form-setting-explanation">
{
__( 'You can see the information about your backups and security scanning in the "At a Glance" section.' )
}
</p>
{
! this.props.isUnavailableInDevMode( 'backups' ) && (
<p>
<span>
<ExternalLink className="jp-module-settings__external-link" href="https://dashboard.vaultpress.com/" >{ __( 'Configure your Security Scans' ) }</ExternalLink>
</p>
</span>
)
}
</SettingsGroup>
Expand Down
4 changes: 2 additions & 2 deletions _inc/client/traffic/seo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ export const SEO = moduleSettingsForm(
</p>
{
! this.props.isUnavailableInDevMode( 'seo-tools' ) && (
<p>
<span>
<ExternalLink className="jp-module-settings__external-link" href={ this.props.configureUrl }>{ __( 'Configure your SEO settings' ) }</ExternalLink>
</p>
</span>
)
}
</SettingsGroup>
Expand Down
1 change: 1 addition & 0 deletions _inc/client/traffic/site-stats.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const SiteStats = moduleSettingsForm(
</span>
</ModuleToggle>
</FormFieldset>
<br />
<InlineExpand label={ __( 'Advanced Options' ) }>
<div>
<FormFieldset>
Expand Down