From 31227b8b4a85e072a1624a39bdab4bbd0a8f8ac9 Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Tue, 30 Mar 2021 15:30:08 +0530 Subject: [PATCH 1/6] Fix z-index issue in Gutenberg block control panel #2650 --- assets/scss/gutenberg-editor-style.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/scss/gutenberg-editor-style.scss b/assets/scss/gutenberg-editor-style.scss index 68c3eed8dd..eb1c4d65d7 100644 --- a/assets/scss/gutenberg-editor-style.scss +++ b/assets/scss/gutenberg-editor-style.scss @@ -19,3 +19,9 @@ @import "gutenberg-editor/layout"; @import "gutenberg-editor/media-queries"; } + +.interface-complementary-area { + .components-panel__header { + z-index: 9999; + } +} \ No newline at end of file From dbf534155fd64d18fb14fc047e30ba31a0675ece Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Tue, 30 Mar 2021 16:32:05 +0530 Subject: [PATCH 2/6] Create new POT file #2650 --- languages/neve.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/neve.pot b/languages/neve.pot index 96d6cee9b3..936bd598b0 100755 --- a/languages/neve.pot +++ b/languages/neve.pot @@ -2,7 +2,7 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Neve 2.10.2\n" +"Project-Id-Version: Neve 2.10.4\n" "Report-Msgid-Bugs-To: https://github.com/Codeinwp/neve/issues\n" "Last-Translator: friends@themeisle.com\n" "Language-Team: LANGUAGE \n" From 180628c158d33041f4d6248e4d07b49dd3fbb57b Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Thu, 1 Apr 2021 18:33:57 +0530 Subject: [PATCH 3/6] Fix PHP notices #1630 --- inc/customizer/controls/react/font_family.php | 13 +++++++++++++ inc/customizer/controls/react/global_colors.php | 13 +++++++++++++ inc/customizer/controls/react/range.php | 13 +++++++++++++ inc/customizer/controls/react/responsive_range.php | 13 +++++++++++++ inc/customizer/controls/react/spacing.php | 13 +++++++++++++ inc/customizer/controls/react/typography.php | 13 +++++++++++++ 6 files changed, 78 insertions(+) diff --git a/inc/customizer/controls/react/font_family.php b/inc/customizer/controls/react/font_family.php index c58a5dd71c..b1110f7583 100644 --- a/inc/customizer/controls/react/font_family.php +++ b/inc/customizer/controls/react/font_family.php @@ -32,4 +32,17 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } diff --git a/inc/customizer/controls/react/global_colors.php b/inc/customizer/controls/react/global_colors.php index 1fe7965781..e5cd2a3135 100644 --- a/inc/customizer/controls/react/global_colors.php +++ b/inc/customizer/controls/react/global_colors.php @@ -41,4 +41,17 @@ public function to_json() { $this->json['defaultValues'] = $this->default_values; $this->json['input_attrs'] = $this->input_attrs; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } diff --git a/inc/customizer/controls/react/range.php b/inc/customizer/controls/react/range.php index f21e9f1ed1..0efe1e3c8e 100644 --- a/inc/customizer/controls/react/range.php +++ b/inc/customizer/controls/react/range.php @@ -33,4 +33,17 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } diff --git a/inc/customizer/controls/react/responsive_range.php b/inc/customizer/controls/react/responsive_range.php index d000fb4151..e357235680 100644 --- a/inc/customizer/controls/react/responsive_range.php +++ b/inc/customizer/controls/react/responsive_range.php @@ -33,4 +33,17 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } diff --git a/inc/customizer/controls/react/spacing.php b/inc/customizer/controls/react/spacing.php index a1b2c199b5..6f021dba85 100644 --- a/inc/customizer/controls/react/spacing.php +++ b/inc/customizer/controls/react/spacing.php @@ -41,4 +41,17 @@ public function to_json() { $this->json['input_attrs'] = $this->input_attrs; $this->json['default'] = $this->default; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } diff --git a/inc/customizer/controls/react/typography.php b/inc/customizer/controls/react/typography.php index 468a09b73a..c8b1c90b38 100644 --- a/inc/customizer/controls/react/typography.php +++ b/inc/customizer/controls/react/typography.php @@ -40,4 +40,17 @@ public function to_json() { $this->json['input_attrs'] = is_array( $this->input_attrs ) ? wp_json_encode( $this->input_attrs ) : $this->input_attrs; $this->json['refresh_on_reset'] = $this->refresh_on_reset; } + + /** + * Render the custom attributes for the control's input element. + */ + public function input_attrs() { + foreach ( $this->input_attrs as $attr => $value ) { + if ( is_array( $value ) && ! empty( $value ) ) { + echo esc_html( $attr ) . '="' . wp_json_encode( $value ) . '" '; + } else { + echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; + } + } + } } From 16c384b54d0c23be84d47bc03af6361c841d4c00 Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Fri, 2 Apr 2021 15:56:43 +0530 Subject: [PATCH 4/6] Revert code PHP notice #1630 --- inc/customizer/controls/react/font_family.php | 13 ------------- inc/customizer/controls/react/global_colors.php | 13 ------------- inc/customizer/controls/react/range.php | 13 ------------- inc/customizer/controls/react/responsive_range.php | 13 ------------- inc/customizer/controls/react/spacing.php | 13 ------------- inc/customizer/controls/react/typography.php | 13 ------------- 6 files changed, 78 deletions(-) diff --git a/inc/customizer/controls/react/font_family.php b/inc/customizer/controls/react/font_family.php index b1110f7583..c58a5dd71c 100644 --- a/inc/customizer/controls/react/font_family.php +++ b/inc/customizer/controls/react/font_family.php @@ -32,17 +32,4 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } diff --git a/inc/customizer/controls/react/global_colors.php b/inc/customizer/controls/react/global_colors.php index e5cd2a3135..1fe7965781 100644 --- a/inc/customizer/controls/react/global_colors.php +++ b/inc/customizer/controls/react/global_colors.php @@ -41,17 +41,4 @@ public function to_json() { $this->json['defaultValues'] = $this->default_values; $this->json['input_attrs'] = $this->input_attrs; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } diff --git a/inc/customizer/controls/react/range.php b/inc/customizer/controls/react/range.php index 0efe1e3c8e..f21e9f1ed1 100644 --- a/inc/customizer/controls/react/range.php +++ b/inc/customizer/controls/react/range.php @@ -33,17 +33,4 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } diff --git a/inc/customizer/controls/react/responsive_range.php b/inc/customizer/controls/react/responsive_range.php index e357235680..d000fb4151 100644 --- a/inc/customizer/controls/react/responsive_range.php +++ b/inc/customizer/controls/react/responsive_range.php @@ -33,17 +33,4 @@ public function to_json() { parent::to_json(); $this->json['input_attrs'] = $this->input_attrs; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } diff --git a/inc/customizer/controls/react/spacing.php b/inc/customizer/controls/react/spacing.php index 6f021dba85..a1b2c199b5 100644 --- a/inc/customizer/controls/react/spacing.php +++ b/inc/customizer/controls/react/spacing.php @@ -41,17 +41,4 @@ public function to_json() { $this->json['input_attrs'] = $this->input_attrs; $this->json['default'] = $this->default; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . esc_attr( wp_json_encode( $value ) ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } diff --git a/inc/customizer/controls/react/typography.php b/inc/customizer/controls/react/typography.php index c8b1c90b38..468a09b73a 100644 --- a/inc/customizer/controls/react/typography.php +++ b/inc/customizer/controls/react/typography.php @@ -40,17 +40,4 @@ public function to_json() { $this->json['input_attrs'] = is_array( $this->input_attrs ) ? wp_json_encode( $this->input_attrs ) : $this->input_attrs; $this->json['refresh_on_reset'] = $this->refresh_on_reset; } - - /** - * Render the custom attributes for the control's input element. - */ - public function input_attrs() { - foreach ( $this->input_attrs as $attr => $value ) { - if ( is_array( $value ) && ! empty( $value ) ) { - echo esc_html( $attr ) . '="' . wp_json_encode( $value ) . '" '; - } else { - echo esc_html( $attr ) . '="' . esc_attr( $value ) . '" '; - } - } - } } From 3d830e6a7a5592f4e636a479cecf549b4734d4c2 Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Mon, 5 Apr 2021 18:47:03 +0530 Subject: [PATCH 5/6] Fix z-index issue in cypress #2650 --- assets/scss/gutenberg-editor-style.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/scss/gutenberg-editor-style.scss b/assets/scss/gutenberg-editor-style.scss index eb1c4d65d7..9c367d1a9d 100644 --- a/assets/scss/gutenberg-editor-style.scss +++ b/assets/scss/gutenberg-editor-style.scss @@ -20,8 +20,10 @@ @import "gutenberg-editor/media-queries"; } -.interface-complementary-area { - .components-panel__header { - z-index: 9999; +.neve-meta-button-group { + .components-button-group { + .components-button.is-primary { + z-index: inherit; + } } } \ No newline at end of file From 8be5868fd6449c661939f9d653ff2738b9b24f21 Mon Sep 17 00:00:00 2001 From: girishkrishawe Date: Mon, 5 Apr 2021 19:08:58 +0530 Subject: [PATCH 6/6] Remove z-index on import button #2650 --- assets/scss/gutenberg-editor-style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/gutenberg-editor-style.scss b/assets/scss/gutenberg-editor-style.scss index 9c367d1a9d..639610b076 100644 --- a/assets/scss/gutenberg-editor-style.scss +++ b/assets/scss/gutenberg-editor-style.scss @@ -22,7 +22,7 @@ .neve-meta-button-group { .components-button-group { - .components-button.is-primary { + .components-button.is-primary:not(.import) { z-index: inherit; } }