From ba3fca5103c468fc4aa83ec04f68bc27a5a0fc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= Date: Wed, 29 Apr 2020 13:34:42 +0200 Subject: [PATCH] scsslint fixes [MAILPOET-2770] --- assets/css/src/components-plugin/_settings.scss | 13 +++++++------ assets/css/src/mailpoet-admin.scss | 1 + assets/css/src/mailpoet-editor.scss | 5 +++++ assets/css/src/mailpoet-form-editor.scss | 4 ++++ assets/css/src/mailpoet-plugin.scss | 6 ++++++ assets/css/src/mailpoet-post-editor-block.scss | 1 + assets/css/src/mailpoet-public.scss | 2 ++ 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/assets/css/src/components-plugin/_settings.scss b/assets/css/src/components-plugin/_settings.scss index 460284b9de..2f9b0d9669 100644 --- a/assets/css/src/components-plugin/_settings.scss +++ b/assets/css/src/components-plugin/_settings.scss @@ -31,17 +31,18 @@ } .button-secondary { + font-size: 14px; line-height: 2; + margin: 0 3px; min-height: 30px; vertical-align: unset; - margin: 0px 3px; - font-size: 14px; } - .mailpoet_mta_setup_save, .mailpoet_mta_setup_cancel { + .mailpoet_mta_setup_save, + .mailpoet_mta_setup_cancel { display: inline-block; - margin: 0px 3px; font-weight: bold; + margin: 0 3px; } .mailpoet_emails_per_second_warning { @@ -91,9 +92,9 @@ ul.sending-method-benefits { margin: 2px; } -.mailpoet-settings-inputs input[type="checkbox"] { - margin-left: 4px; +.mailpoet-settings-inputs input[type='checkbox'] { margin-bottom: 4px; + margin-left: 4px; } .mailpoet-settings-inputs input.regular-text { diff --git a/assets/css/src/mailpoet-admin.scss b/assets/css/src/mailpoet-admin.scss index a66f90c225..349f5d7a2b 100644 --- a/assets/css/src/mailpoet-admin.scss +++ b/assets/css/src/mailpoet-admin.scss @@ -1,4 +1,5 @@ // Utilities // Helpers and overrides. + @import 'components-admin/menu'; @import 'components-admin/3rd-party-plugins/members'; diff --git a/assets/css/src/mailpoet-editor.scss b/assets/css/src/mailpoet-editor.scss index f753068a1c..6345f39e95 100644 --- a/assets/css/src/mailpoet-editor.scss +++ b/assets/css/src/mailpoet-editor.scss @@ -1,5 +1,6 @@ // Settings // Global variables, config switches. Not producing any CSS. + @import 'settings/grid'; @import 'settings/colors'; @import 'settings/editor'; @@ -7,15 +8,18 @@ // Tools // Default mixins and functions. Still not producing any CSS. + @import 'mixins/animations'; @import 'mixins/breakpoints'; // Generic // 3rd-party styles, can be overwritten. + @import '../../../node_modules/spectrum-colorpicker/spectrum'; // Components // Actual UI components. + @import 'components-editor/buttons'; @import 'components-editor/common'; @import 'components-editor/forms'; @@ -48,4 +52,5 @@ // Utilities // Helpers and overrides. + @import 'components-editor/3rd-party-overrides/overrides'; diff --git a/assets/css/src/mailpoet-form-editor.scss b/assets/css/src/mailpoet-form-editor.scss index acba66f07d..49875803fc 100644 --- a/assets/css/src/mailpoet-form-editor.scss +++ b/assets/css/src/mailpoet-form-editor.scss @@ -1,13 +1,16 @@ // Settings // Global variables, config switches. Not producing any CSS. + @import 'settings/form-editor'; // Tools // Default mixins and functions. Still not producing any CSS. + @import 'mixins/breakpoints'; // Generic // 3rd-party styles, can be overwritten. + @import '../../../node_modules/@wordpress/edit-post/build-style/style'; @import '../../../node_modules/@wordpress/editor/build-style/style'; @import '../../../node_modules/@wordpress/components/build-style/style'; @@ -20,6 +23,7 @@ // Components // Actual UI components. + @import './components-form-editor/form-title'; @import './components-form-editor/header'; @import './components-form-editor/helpscout'; diff --git a/assets/css/src/mailpoet-plugin.scss b/assets/css/src/mailpoet-plugin.scss index adb1e7693f..391934cdd7 100644 --- a/assets/css/src/mailpoet-plugin.scss +++ b/assets/css/src/mailpoet-plugin.scss @@ -1,8 +1,10 @@ // Fonts + @import 'https://use.typekit.net/aps3nxt.css'; // Settings // Global variables, config switches. Not producing any CSS. + @import 'settings/grid'; @import 'settings/badge'; @import 'settings/colors'; @@ -14,18 +16,22 @@ // Tools // Default mixins and functions. Still not producing any CSS. + @import 'mixins/breakpoints'; @import 'mixins/clearfix'; // Generic + @import 'generic/typography'; // 3rd party styles + @import '../../../node_modules/select2/dist/css/select2'; @import 'components-plugin/3rd-party-plugins/datepicker'; // Components // Actual UI components. + @import 'components/parsley'; @import 'components-plugin/automatic-emails'; @import 'components-plugin/browser-preview'; diff --git a/assets/css/src/mailpoet-post-editor-block.scss b/assets/css/src/mailpoet-post-editor-block.scss index f411c1b0f5..3633cc16d0 100644 --- a/assets/css/src/mailpoet-post-editor-block.scss +++ b/assets/css/src/mailpoet-post-editor-block.scss @@ -1,3 +1,4 @@ // Components // Actual UI components. + @import 'components-post-editor-block/post-editor-block'; diff --git a/assets/css/src/mailpoet-public.scss b/assets/css/src/mailpoet-public.scss index 373bbb1e73..2058b67edd 100644 --- a/assets/css/src/mailpoet-public.scss +++ b/assets/css/src/mailpoet-public.scss @@ -1,9 +1,11 @@ // Tools // Default mixins and functions. Not producing any CSS. + @import 'mixins/breakpoints'; @import 'mixins/clearfix'; // Components // Actual UI components. + @import 'components/parsley'; @import 'components-public/public';