Site Settings: Consolidate info link container styles (#11609)

Automattic · Feb 27, 2017 · 300b5ae · 300b5ae
1 parent fad9bff
commit 300b5ae
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 27 deletions.
diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss
@@ -314,20 +314,17 @@
 @import 'my-sites/site-indicator/style';
 @import 'my-sites/site-settings/style';
 @import 'my-sites/site-settings/action-panel/style';
-@import 'my-sites/site-settings/composing/style';
 @import 'my-sites/site-settings/custom-content-types/style';
 @import 'my-sites/site-settings/comment-display-settings/style';
 @import 'my-sites/site-settings/delete-site/style';
 @import 'my-sites/site-settings/delete-site-options/style';
 @import 'my-sites/site-settings/delete-site-warning-dialog/style';
 @import 'my-sites/site-settings/jetpack-sync-panel/style';
-@import 'my-sites/site-settings/media-settings/style';
 @import 'my-sites/site-settings/press-this/style';
 @import 'my-sites/site-settings/publishing-tools/style';
 @import 'my-sites/site-settings/site-icon-setting/style';
 @import 'my-sites/site-settings/subscriptions/style';
 @import 'my-sites/site-settings/taxonomies/style';
-@import 'my-sites/site-settings/theme-enhancements/style';
 @import 'my-sites/importer/style';
 @import 'blocks/site/style';
 @import 'my-sites/sites/style';

diff --git a/client/my-sites/site-settings/composing/after-the-deadline.jsx b/client/my-sites/site-settings/composing/after-the-deadline.jsx
@@ -174,7 +174,7 @@ class AfterTheDeadline extends Component {
 
 		return (
 			<FormFieldset>
-				<div className="composing__info-link-container">
+				<div className="composing__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink href={ 'https://jetpack.com/support/spelling-and-grammar/' } target="_blank">
 							{ translate( 'Learn more about After the Deadline' ) }

diff --git a/client/my-sites/site-settings/composing/style.scss b/client/my-sites/site-settings/composing/style.scss
diff --git a/client/my-sites/site-settings/media-settings/index.jsx b/client/my-sites/site-settings/media-settings/index.jsx
@@ -35,7 +35,7 @@ const MediaSettings = ( {
 	return (
 		<Card className="media-settings site-settings site-settings__module-settings">
 			<FormFieldset>
-				<div className="media-settings__info-link-container">
+				<div className="media-settings__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink target="_blank" icon={ true } href={ 'https://jetpack.com/support/photon' } >
 							{ translate( 'Learn more about Photon' ) }
@@ -51,7 +51,7 @@ const MediaSettings = ( {
 					/>
 			</FormFieldset>
 			<FormFieldset className="media-settings__formfieldset has-divider is-top-only">
-				<div className="media-settings__info-link-container">
+				<div className="media-settings__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink target="_blank" icon={ true } href={ 'https://jetpack.com/support/carousel' } >
 							{ translate( 'Learn more about Carousel' ) }

diff --git a/client/my-sites/site-settings/media-settings/style.scss b/client/my-sites/site-settings/media-settings/style.scss
diff --git a/client/my-sites/site-settings/publishing-tools/index.jsx b/client/my-sites/site-settings/publishing-tools/index.jsx
@@ -91,7 +91,7 @@ class PublishingTools extends Component {
 
 		return (
 			<FormFieldset>
-				<div className="publishing-tools__info-link-container">
+				<div className="publishing-tools__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink href={ 'https://jetpack.com/support/post-by-email/' } target="_blank">
 							{ translate( 'Learn more about Post by Email' ) }

diff --git a/client/my-sites/site-settings/publishing-tools/style.scss b/client/my-sites/site-settings/publishing-tools/style.scss
@@ -16,7 +16,3 @@
 	display: block;
 	margin-bottom: 8px;
 }
-
-.publishing-tools__info-link-container {
-	float: right;
-}
diff --git a/client/my-sites/site-settings/style.scss b/client/my-sites/site-settings/style.scss
@@ -412,6 +412,10 @@
 	margin: 16px 36px 0;
 }
 
+.site-settings__info-link-container {
+	float: right;
+}
+
 .site-settings__date-time-format-custom {
 	.form-radio {
 		display: none;

diff --git a/client/my-sites/site-settings/subscriptions/index.jsx b/client/my-sites/site-settings/subscriptions/index.jsx
@@ -30,7 +30,7 @@ const Subscriptions = ( {
 	return (
 		<Card className="subscriptions site-settings">
 			<FormFieldset>
-				<div className="subscriptions__info-link-container">
+				<div className="subscriptions__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink href={ 'https://jetpack.com/support/subscriptions' } target="_blank">
 							{ translate( 'Learn more about Subscriptions' ) }

diff --git a/client/my-sites/site-settings/subscriptions/style.scss b/client/my-sites/site-settings/subscriptions/style.scss
@@ -1,7 +1,3 @@
 .subscriptions__email-followers {
 	margin-top: 16px;
 }
-
-.subscriptions__info-link-container {
-	float: right;
-}
diff --git a/client/my-sites/site-settings/theme-enhancements/index.jsx b/client/my-sites/site-settings/theme-enhancements/index.jsx
@@ -78,7 +78,7 @@ class ThemeEnhancements extends Component {
 
 		return (
 			<FormFieldset>
-				<div className="theme-enhancements__info-link-container">
+				<div className="theme-enhancements__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink href={ 'https://jetpack.com/support/infinite-scroll' } target="_blank">
 							{ translate( 'Learn more about Infinite Scroll' ) }
@@ -119,7 +119,7 @@ class ThemeEnhancements extends Component {
 
 		return (
 			<FormFieldset>
-				<div className="theme-enhancements__info-link-container">
+				<div className="theme-enhancements__info-link-container site-settings__info-link-container">
 					<InfoPopover position={ 'left' }>
 						<ExternalLink href={ 'https://jetpack.com/support/mobile-theme' } target="_blank">
 							{ translate( 'Learn more about Mobile Theme' ) }

diff --git a/client/my-sites/site-settings/theme-enhancements/style.scss b/client/my-sites/site-settings/theme-enhancements/style.scss