diff --git a/client/analytics/settings/historical-data/actions.js b/client/analytics/settings/historical-data/actions.js index 405de86f3bd..92fc0795451 100644 --- a/client/analytics/settings/historical-data/actions.js +++ b/client/analytics/settings/historical-data/actions.js @@ -57,7 +57,7 @@ function HistoricalDataActions( { > { __( 'Start', 'woocommerce-admin' ) } - - } @@ -103,7 +103,7 @@ describe( 'ActivityCard', () => { , - , ] } diff --git a/client/header/activity-panel/panels/inbox/action.js b/client/header/activity-panel/panels/inbox/action.js index 4fbd0242fc7..e953e53499e 100644 --- a/client/header/activity-panel/panels/inbox/action.js +++ b/client/header/activity-panel/panels/inbox/action.js @@ -60,10 +60,11 @@ class InboxNoteAction extends Component { render() { const { action, dismiss, label } = this.props; + const isPrimary = dismiss || action.primary; return ( diff --git a/client/header/activity-panel/panels/stock/card.js b/client/header/activity-panel/panels/stock/card.js index 9d4aaabdcec..93555123e58 100644 --- a/client/header/activity-panel/panels/stock/card.js +++ b/client/header/activity-panel/panels/stock/card.js @@ -96,7 +96,7 @@ class ProductStockCard extends Component { } return [ - , ]; diff --git a/client/homepage/stats-overview/style.scss b/client/homepage/stats-overview/style.scss index 79db6dbd089..6cb2c3b8e55 100644 --- a/client/homepage/stats-overview/style.scss +++ b/client/homepage/stats-overview/style.scss @@ -75,17 +75,8 @@ article.woocommerce-stats-overview__install-jetpack-promo { footer { border-top: 1px solid $promo-actions-border; - // All of this added specificity is required because styles that - // need overriding are already specified at a high level. - .woocommerce-layout & button.components-button, - .woocommerce-layout & button.components-button.is-button { - padding: 8px 16px; + .components-button { margin: 16px 4px; - height: inherit; - color: $theme-color; - cursor: pointer; - line-height: 2; - border-radius: 3px; &.is-busy { background-image: linear-gradient(-45deg, lighten($theme-color, 40%) 28%, #fff 0, #fff 72%, lighten($theme-color, 40%) 0); diff --git a/client/layout/store-alerts/index.js b/client/layout/store-alerts/index.js index e42e06e94e2..bf122b1feea 100644 --- a/client/layout/store-alerts/index.js +++ b/client/layout/store-alerts/index.js @@ -71,7 +71,7 @@ class StoreAlerts extends Component { ` element. ```jsx - ) + ); } getFinishSetupButton() { return ( - ) + ); } render() { @@ -142,7 +141,9 @@ class InstalledExtensionRow extends Component {

{ name }

{ status === 'configured' || ( -

{ description }

+

+ { description } +

) }
@@ -150,7 +151,7 @@ class InstalledExtensionRow extends Component {
- ) + ); } } diff --git a/client/profile-wizard/steps/benefits/index.js b/client/profile-wizard/steps/benefits/index.js index 8559a1a415b..3b906f3027e 100644 --- a/client/profile-wizard/steps/benefits/index.js +++ b/client/profile-wizard/steps/benefits/index.js @@ -17,7 +17,7 @@ import { pluginNames, ONBOARDING_STORE_NAME, PLUGINS_STORE_NAME, - OPTIONS_STORE_NAME + OPTIONS_STORE_NAME, } from '@woocommerce/data'; /** @@ -232,7 +232,7 @@ class Benefits extends Component { { __( 'Yes please!', 'woocommerce-admin' ) } diff --git a/client/task-list/tasks/payments/paypal.js b/client/task-list/tasks/payments/paypal.js index 20aba7a9cd3..b622169dce8 100644 --- a/client/task-list/tasks/payments/paypal.js +++ b/client/task-list/tasks/payments/paypal.js @@ -109,7 +109,7 @@ class PayPal extends Component { renderConnectButton() { const { connectURL } = this.state; return ( - ); diff --git a/client/task-list/tasks/payments/square.js b/client/task-list/tasks/payments/square.js index f899d11f3a2..33e1ca35eb7 100644 --- a/client/task-list/tasks/payments/square.js +++ b/client/task-list/tasks/payments/square.js @@ -128,7 +128,6 @@ class Square extends Component { ); diff --git a/client/task-list/tasks/payments/wcpay.js b/client/task-list/tasks/payments/wcpay.js index ced4f71f8c5..2b6358432d0 100644 --- a/client/task-list/tasks/payments/wcpay.js +++ b/client/task-list/tasks/payments/wcpay.js @@ -95,7 +95,6 @@ class WCPay extends Component { content: (