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

Site settings: updated Jetpack toggle spacing and child-settings indentation #11240

Merged
merged 5 commits into from
Feb 10, 2017
Merged

Site settings: updated Jetpack toggle spacing and child-settings indentation #11240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c130af1
Site settings: updated Jetpack toggle spacing and child-settings inde…
MichaelArestad Feb 7, 2017
dba4c71
Site settings: increased top margin of child settings again
MichaelArestad Feb 7, 2017
afcef55
Update classNames to meet code standards
ryelle Feb 9, 2017
9a6eddf
Remove redundant style
ryelle Feb 9, 2017
8dc60df
Remove indent from custom content
ryelle Feb 9, 2017
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 client/my-sites/site-settings/custom-content-types/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CustomContentTypes extends Component {

renderContentTypeSettings( fieldName, fieldLabel, fieldDescription ) {
return (
<div className="custom-content-types__module-settings is-indented">
<div className="custom-content-types__module-settings">
{ this.renderToggle( fieldName, fieldLabel ) }
<p className="form-setting-explanation">
{ fieldDescription }
Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/site-settings/custom-content-types/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.custom-content-types__module-settings.is-indented {
.custom-content-types__module-settings {
margin-bottom: 24px;

&:last-child {
Expand Down
8 changes: 2 additions & 6 deletions client/my-sites/site-settings/jetpack-module-toggle/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.jetpack-module-toggle .form-toggle__label *:not( .form-toggle__switch ) {
margin-left: 8px;
}

.jetpack-module-toggle p.form-setting-explanation.is-indented {
margin-left: 32px;
}
margin-left: 36px;
}
2 changes: 1 addition & 1 deletion client/my-sites/site-settings/publishing-tools/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class PublishingTools extends Component {
const labelClassName = regeneratingPostByEmail || ! postByEmailAddressModuleActive ? 'is-disabled' : null;

return (
<div className="publishing-tools__module-settings is-indented">
<div className="publishing-tools__module-settings site-settings__child-settings">
<FormLabel className={ labelClassName }>
{ translate( 'Email Address' ) }
</FormLabel>
Expand Down
20 changes: 3 additions & 17 deletions client/my-sites/site-settings/publishing-tools/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,9 @@
}
}

.publishing-tools__module-settings.is-indented {
margin: 16px 32px;

.form-label {
&.is-disabled {
opacity: 0.3;
}
}

.form-toggle__switch {
margin-right: 8px;
}

.publishing-tools__email-address {
display: block;
margin-bottom: 8px;
}
.publishing-tools__email-address {
display: block;
margin-bottom: 8px;
}

.publishing-tools__info-link-container {
Expand Down
17 changes: 13 additions & 4 deletions client/my-sites/site-settings/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@
margin-bottom: 8px;
}
}

.site-settings__child-settings {
margin-left: 36px;
}
}

.site-settings__general-settings, .site-settings__writing-settings {
Expand Down Expand Up @@ -396,3 +392,16 @@
.site-settings__taxonomies {
margin-bottom: 17px;
}

// Site settings group styles
.site-settings__module-settings {
.form-label {
&.is-disabled {
opacity: 0.3;
}
}
}

.site-settings__child-settings {
margin: 16px 36px 0;
}
4 changes: 2 additions & 2 deletions client/my-sites/site-settings/subscriptions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Subscriptions = ( {
translate
} ) => {
return (
<Card className="subscriptions__card site-settings">
<Card className="subscriptions site-settings">
<FormFieldset>
<div className="subscriptions__info-link-container">
<InfoPopover position={ 'left' }>
Expand All @@ -45,7 +45,7 @@ const Subscriptions = ( {
disabled={ isRequestingSettings || isSavingSettings }
/>

<div className="subscriptions__module-settings is-indented">
<div className="subscriptions__module-settings site-settings__child-settings">
<FormToggle
className="subscriptions__module-settings-toggle is-compact"
checked={ !! fields.stb_enabled }
Expand Down
10 changes: 3 additions & 7 deletions client/my-sites/site-settings/subscriptions/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
.subscriptions__module-settings.is-indented {
margin: 16px 32px;

.subscriptions__email-followers {
margin-top: 16px;
}
.subscriptions__email-followers {
margin-top: 16px;
}

.subscriptions__info-link-container {
float: right;
}
}
4 changes: 2 additions & 2 deletions client/my-sites/site-settings/theme-enhancements/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class ThemeEnhancements extends Component {
disabled={ formPending }
/>

<div className="theme-enhancements__module-settings is-indented">
<div className="theme-enhancements__module-settings site-settings__child-settings">
{
this.renderToggle( 'infinite_scroll', ! infiniteScrollModuleActive, translate(
'Scroll infinitely (Shows 7 posts on each load)'
Expand Down Expand Up @@ -134,7 +134,7 @@ class ThemeEnhancements extends Component {
disabled={ formPending }
/>

<div className="theme-enhancements__module-settings is-indented">
<div className="theme-enhancements__module-settings site-settings__child-settings">
{
this.renderToggle( 'wp_mobile_excerpt', ! minilevenModuleActive, translate(
'Show excerpts on front page and on archive pages instead of full posts'
Expand Down
4 changes: 0 additions & 4 deletions client/my-sites/site-settings/theme-enhancements/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.theme-enhancements__module-settings.is-indented {
margin: 16px 32px 0;
}

.theme-enhancements__info-link-container {
float: right;
}