From bdbe6e258c432d297051265533c15513550c70ed Mon Sep 17 00:00:00 2001 From: alternatekev Date: Thu, 10 Dec 2015 15:05:14 -0700 Subject: [PATCH] modified site-settings/general to use sectionheader and clickable card patterns updated verbiage from Manage Jetpack Monitor Settings to View Jetpack Monitor Settings removed some of the verbiage I'd added to the jetpack disconnection dialog. after seeing the extra copy in the dialog, i decided it didn't work very well and was unnecessary anyway added a space to the scss, and moved the whole file into the right directory, out of assets/stylesheets added space to jetpack button scss --- assets/stylesheets/_components.scss | 1 + assets/stylesheets/style.scss | 1 - client/my-sites/plugins/style.scss | 9 +- .../my-sites/site-settings/form-general.jsx | 87 ++++++++----------- .../my-sites/site-settings/style.scss | 3 + 5 files changed, 50 insertions(+), 51 deletions(-) rename assets/stylesheets/sections/_site-settings.scss => client/my-sites/site-settings/style.scss (98%) diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss index c49e4febf69c0a..d1d283fdbc5a28 100644 --- a/assets/stylesheets/_components.scss +++ b/assets/stylesheets/_components.scss @@ -219,6 +219,7 @@ @import 'my-sites/sharing/connections/services-group'; @import 'my-sites/sidebar-navigation/style'; @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/delete-site-options/style'; @import 'my-sites/site-settings/delete-site/style'; diff --git a/assets/stylesheets/style.scss b/assets/stylesheets/style.scss index 4ed9cc8d2334ff..56951374477db4 100644 --- a/assets/stylesheets/style.scss +++ b/assets/stylesheets/style.scss @@ -32,7 +32,6 @@ @import 'sections/stats'; // stats page styles @import 'sections/upgrades'; // upgrades page styles @import 'sections/sharing'; // sharing page styles -@import 'sections/site-settings'; // blog setting styles @import 'sections/notifications'; // notifications styles @import 'sections/checkout'; // Checkout styles @import 'sections/billing-history'; // Billing History styles diff --git a/client/my-sites/plugins/style.scss b/client/my-sites/plugins/style.scss index 892bf1d8c50a75..4dfe16a16e2230 100644 --- a/client/my-sites/plugins/style.scss +++ b/client/my-sites/plugins/style.scss @@ -78,4 +78,11 @@ .plugins__plugin-list-state { white-space: nowrap; -} \ No newline at end of file +} + +.disconnect-jetpack-button { + margin-right: 8px; +} +.card.is-compact.section-header.after-compact { + margin-top: 16px; +} diff --git a/client/my-sites/site-settings/form-general.jsx b/client/my-sites/site-settings/form-general.jsx index 308e7260e64bba..9243dd2c62b508 100644 --- a/client/my-sites/site-settings/form-general.jsx +++ b/client/my-sites/site-settings/form-general.jsx @@ -225,7 +225,7 @@ module.exports = React.createClass( { onClick={ this.recordEvent.bind( this, 'Clicked Site Visibility Radio Button' ) } /> { this.translate( 'Discourage search engines from indexing this site' ) } -

+

{ this.translate( 'Note: This option does not block access to your site — it is up to search engines to honor your request.' ) }

@@ -316,36 +316,13 @@ module.exports = React.createClass( { ); }, - jetpackOptions: function() { - var site = this.props.site; - - if ( ! site.jetpack ) { - return null; - } - - return ( -
- { this.translate( 'Jetpack Status' ) } - { this.syncNonPublicPostTypes() } -

{ - this.translate( 'You can also {{manageLink}}manage the monitor settings{{/manageLink}} and {{migrateLink}}migrate followers{{/migrateLink}}.', { - components: { - manageLink: , - migrateLink: - } - } ) - }

-
- ); - }, - jetpackDisconnectOption: function() { var site = this.props.site, disconnectText; @@ -358,26 +335,11 @@ module.exports = React.createClass( { context: 'Jetpack: Action user takes to disconnect Jetpack site from .com link in general site settings' } ); - return ( -
- { this.translate( 'Jetpack Connection' ) } -
    -
  • - -
    • -
-
- ); + return ; }, holidaySnowOption: function() { @@ -435,6 +397,7 @@ module.exports = React.createClass( {
{ this.siteOptions() } { this.languageOptions() } + { this.holidaySnowOption() }
@@ -456,7 +419,36 @@ module.exports = React.createClass( { { this.visibilityOptions() } - + { this.props.site.jetpack + ?
+ + { this.jetpackDisconnectOption() } + + + +
+ { this.syncNonPublicPostTypes() } +
+ + + { this.translate( 'View Jetpack Monitor Settings' ) } + + + { this.translate( 'Migrate followers from another WordPress.com blog' ) } + +
+ : null } +