diff --git a/_inc/client/discussion/index.jsx b/_inc/client/discussion/index.jsx
index 9bec60f77b18c..d203c8dc0e432 100644
--- a/_inc/client/discussion/index.jsx
+++ b/_inc/client/discussion/index.jsx
@@ -3,10 +3,12 @@
*/
import React from 'react';
import { connect } from 'react-redux';
+import { translate as __ } from 'i18n-calypso';
/**
* Internal dependencies
*/
+import Card from 'components/card';
import { getModule, getModuleOverride } from 'state/modules';
import { getSettings } from 'state/settings';
import { isDevMode, isUnavailableInDevMode, isCurrentUserLinked } from 'state/connection';
@@ -44,6 +46,12 @@ export class Discussion extends React.Component {
return (
+
+
+
+
+
+
{ foundBackups && }
{ foundMonitor && }
{ foundAkismet && (
diff --git a/_inc/client/settings/index.jsx b/_inc/client/settings/index.jsx
index dde08ab7b88c6..a7f6896b5920f 100644
--- a/_inc/client/settings/index.jsx
+++ b/_inc/client/settings/index.jsx
@@ -8,12 +8,12 @@ import { translate as __ } from 'i18n-calypso';
* Internal dependencies
*/
import Discussion from 'discussion';
-import Security from 'security/index.jsx';
+import Security from 'security';
import Traffic from 'traffic';
-import Writing from 'writing/index.jsx';
-import Sharing from 'sharing/index.jsx';
-import SearchableModules from 'searchable-modules/index.jsx';
-import Privacy from 'privacy/index.jsx';
+import Writing from 'writing';
+import Sharing from 'sharing';
+import SearchableModules from 'searchable-modules';
+import Privacy from 'privacy';
export default class extends React.Component {
static displayName = 'SearchableSettings';
diff --git a/_inc/client/settings/style.scss b/_inc/client/settings/style.scss
index c30ceb6346952..088f14921a0b2 100644
--- a/_inc/client/settings/style.scss
+++ b/_inc/client/settings/style.scss
@@ -16,4 +16,11 @@
.dops-search.is-expanded-to-container {
height: 46px;
}
-}
\ No newline at end of file
+}
+
+.dops-card.jp-settings-description {
+ margin: 24px 0 8px;
+ padding: 0;
+ background: none;
+ box-shadow: none;
+}
diff --git a/_inc/client/sharing/index.jsx b/_inc/client/sharing/index.jsx
index 9d746c355d3c3..a37f3fff3f98e 100644
--- a/_inc/client/sharing/index.jsx
+++ b/_inc/client/sharing/index.jsx
@@ -3,10 +3,12 @@
*/
import React, { Component } from 'react';
import { connect } from 'react-redux';
+import { translate as __ } from 'i18n-calypso';
/**
* Internal dependencies
*/
+import Card from 'components/card';
import { getModule } from 'state/modules';
import { getSettings } from 'state/settings';
import { isDevMode, isUnavailableInDevMode, isCurrentUserLinked, getConnectUrl } from 'state/connection';
@@ -51,6 +53,12 @@ class Sharing extends Component {
return (
+
+
+
{
foundPublicize && (
+
+
+
{
foundSearch && (
+
+
+
{
this.props.isModuleFound( 'masterbar' ) && ! this.props.masterbarIsAlwaysActive && (