From 14e49a4f13a136869edcea3068f50181c4d08ca4 Mon Sep 17 00:00:00 2001 From: Michele Giorgi Date: Sat, 20 Feb 2021 21:12:13 +0100 Subject: [PATCH 1/3] improve gutenberg 10+ compatibility --- assets/styles/admin/editor_form.scss | 4 ++-- assets/styles/admin/sidebar_form.scss | 9 +++++++++ formality.php | 4 ++-- includes/class-formality.php | 8 ++++---- package.json | 2 +- readme.txt | 9 +++++++-- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/assets/styles/admin/editor_form.scss b/assets/styles/admin/editor_form.scss index 713be1d..dd8fbf5 100644 --- a/assets/styles/admin/editor_form.scss +++ b/assets/styles/admin/editor_form.scss @@ -275,7 +275,7 @@ left: 0; border-color: var(--formality_col1); border: none; - box-shadow: -3px 0 0 0 var(--formality_col1); + box-shadow: -3px 0 0 0 var(--formality_col1) !important; opacity: 0; border-radius: 0; } @@ -388,7 +388,7 @@ border-top-color: var(--formality_col1_alpha); border-top-style: solid; border-top-width: 1px; - box-shadow: none; + box-shadow: none !important; } } } diff --git a/assets/styles/admin/sidebar_form.scss b/assets/styles/admin/sidebar_form.scss index 34f68c1..4f1cbeb 100644 --- a/assets/styles/admin/sidebar_form.scss +++ b/assets/styles/admin/sidebar_form.scss @@ -127,4 +127,13 @@ } } } + ::-webkit-input-placeholder { + color: #757575 !important; + } + :-ms-input-placeholder { + color: #757575 !important; + } + ::placeholder { + color: #757575 !important; + } } diff --git a/formality.php b/formality.php index 408db7b..1afe795 100755 --- a/formality.php +++ b/formality.php @@ -12,7 +12,7 @@ * Plugin Name: Formality * Plugin URI: https://formality.dev * Description: Forms made simple (and cute). Designless, multistep, conversational, secure, all-in-one WordPress forms plugin. - * Version: 1.2.2 + * Version: 1.2.3 * Author: Michele Giorgi * Author URI: https://giorgi.io * License: GPLv3 @@ -51,7 +51,7 @@ /** * Currently plugin version. */ -define( 'FORMALITY_VERSION', '1.2.2' ); +define( 'FORMALITY_VERSION', '1.2.3' ); /** * The code that runs during plugin activation. diff --git a/includes/class-formality.php b/includes/class-formality.php index 579e283..86bd8fe 100755 --- a/includes/class-formality.php +++ b/includes/class-formality.php @@ -59,7 +59,7 @@ public function __construct() { if ( defined( 'FORMALITY_VERSION' ) ) { $this->version = FORMALITY_VERSION; } else { - $this->version = '1.0.1'; + $this->version = '1.2.3'; } $this->formality = 'formality'; @@ -195,12 +195,12 @@ private function define_public_hooks() { * @access private */ private function setup() { - + $plugin_setup = new Formality_Setup( $this->get_formality(), $this->get_version() ); $this->loader->add_action( 'init', $plugin_setup, 'post_types' ); - + } - + /** * Run the loader to execute all of the hooks with WordPress. * diff --git a/package.json b/package.json index db9ea53..fd950a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Formality", - "version": "1.2.2", + "version": "1.2.3", "author": "Michele Giorgi ", "homepage": "https://giorgi.io", "private": true, diff --git a/readme.txt b/readme.txt index f1c7388..1e425f1 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: michelegiorgi Donate link: https://www.paypal.me/michelegiorgi/ Tags: form, conversational, multistep, design form, gutenberg, block editor Requires at least: 5.5 -Tested up to: 5.6 -Stable tag: 1.2.2 +Tested up to: 5.7 +Stable tag: 1.2.3 Requires PHP: 7.0 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.txt @@ -61,6 +61,11 @@ You will find **Formality** menu in your WordPress admin screen. == Changelog == += 1.2.3 = +Release Date: February 20th, 2021 + +* Gutenberg 10+ compatibility + = 1.2.2 = Release Date: January 23th, 2021 From 71a237bce7bdf7f84fea0ce829f31729d23b787c Mon Sep 17 00:00:00 2001 From: Michele Giorgi Date: Sun, 21 Feb 2021 09:43:22 +0100 Subject: [PATCH 2/3] fix typo --- assets/scripts/editor/main/sidebar.js | 26 +++++++++--------- ...t_IT-3c4b2d232f97e5d4401ae142f2499760.json | 4 +-- languages/formality-it_IT.mo | Bin 24408 -> 24408 bytes languages/formality-it_IT.po | 2 +- languages/formality.pot | 2 +- readme.txt | 1 + 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/assets/scripts/editor/main/sidebar.js b/assets/scripts/editor/main/sidebar.js index ecceac6..2e800d0 100644 --- a/assets/scripts/editor/main/sidebar.js +++ b/assets/scripts/editor/main/sidebar.js @@ -14,7 +14,7 @@ const { const { registerPlugin } = wp.plugins; -const { +const { ColorPicker, Panel, PanelBody, @@ -31,7 +31,7 @@ const { TabPanel, } = wp.components; -const { +const { MediaUpload, } = wp.blockEditor; @@ -51,14 +51,14 @@ import { //const { compose } = wp.compose; class Formality_Sidebar extends Component { - + constructor() { super( ...arguments ); - + //get post metas let formality_keys = wp.data.select('core/editor').getEditedPostAttribute('meta') - //define default values + //define default values let default_keys = { '_formality_type': 'standard', '_formality_style': 'box', @@ -86,7 +86,7 @@ class Formality_Sidebar extends Component { '_formality_email': '', '_formality_send_text' : '', } - + //check if formality keys are already defined if(!formality_keys) { formality_keys = default_keys @@ -97,13 +97,13 @@ class Formality_Sidebar extends Component { wp.data.dispatch('core/editor').editPost({meta: formality_keys}) } } - + //set templates variables formality_keys['_formality_templates_count'] = parseInt(formality.templates_count) formality_keys['_formality_templates_progress'] = false formality_keys['_formality_templates_error'] = '' formality_keys['_formality_ssl_status'] = 0 - + //set state and remove loading layer this.state = formality_keys applyFormalityStyles(this.state) @@ -114,7 +114,7 @@ class Formality_Sidebar extends Component { const postId = wp.data.select("core/editor").getCurrentPostId(); const postPermalink = wp.data.select('core/editor').getPermalink(); - + let tabAppearance = (
- { this.state['_formality_logo'] ? + { this.state['_formality_logo'] ? ) - + let tabSettings = ( @@ -427,7 +427,7 @@ class Formality_Sidebar extends Component { title={__('Notifications', 'formality')} initialOpen={ false } > -

{ __('Formality automatically saves all the results in the Wordpress database, but if you want you can also activate e-mail notifications, by entering your address.', 'formality') }

+

{ __('Formality automatically saves all the results in the WordPress database, but if you want you can also activate e-mail notifications, by entering your address.', 'formality') }

 ) - + return ( Date: Sun, 21 Feb 2021 09:59:09 +0100 Subject: [PATCH 3/3] fix release date --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 9095962..703f556 100644 --- a/readme.txt +++ b/readme.txt @@ -62,7 +62,7 @@ You will find **Formality** menu in your WordPress admin screen. == Changelog == = 1.2.3 = -Release Date: February 20th, 2021 +Release Date: February 21th, 2021 * Gutenberg 10+ compatibility * Fix typo