From bd441ca256770a2f488daf5dc5cb6a21dd63da5b Mon Sep 17 00:00:00 2001 From: Rotem Ben-Itzhak Date: Mon, 8 Jun 2020 12:41:35 +0300 Subject: [PATCH 1/7] Fixing Media control dark mode colors. --- assets/dev/scss/direction/editor-dark-mode.scss | 7 +------ assets/dev/scss/editor/panel/controls/_media.scss | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/assets/dev/scss/direction/editor-dark-mode.scss b/assets/dev/scss/direction/editor-dark-mode.scss index 4c860086d4e..3279c957d5d 100644 --- a/assets/dev/scss/direction/editor-dark-mode.scss +++ b/assets/dev/scss/direction/editor-dark-mode.scss @@ -402,13 +402,8 @@ $devices: 'desktop', 'tablet', 'mobile'; } //Media Control -.elementor-control-media-upload-button { - background-color: $theme-dark-gray-darkest; -} - .elementor-control-media__remove { - background-color: $theme-dark-gray-light; - color: $theme-dark-gray-lightest; + border-color: $theme-dark-gray-light; } .elementor-control-media { diff --git a/assets/dev/scss/editor/panel/controls/_media.scss b/assets/dev/scss/editor/panel/controls/_media.scss index 4b733f6cf9a..43d4c48bffd 100644 --- a/assets/dev/scss/editor/panel/controls/_media.scss +++ b/assets/dev/scss/editor/panel/controls/_media.scss @@ -153,6 +153,7 @@ width: 100%; margin-top: 10px; border: 1px solid $editor-lightest; + border-radius: 3px; &__content { @include padding-start(5px); From 137cd440f5a92ce0a8f7a7ab37d3a7cd14a79df0 Mon Sep 17 00:00:00 2001 From: Rotem Ben-Itzhak Date: Mon, 8 Jun 2020 12:41:54 +0300 Subject: [PATCH 2/7] Fixing dark mode color. --- assets/dev/scss/direction/editor-dark-mode.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/dev/scss/direction/editor-dark-mode.scss b/assets/dev/scss/direction/editor-dark-mode.scss index 3279c957d5d..5194053b28f 100644 --- a/assets/dev/scss/direction/editor-dark-mode.scss +++ b/assets/dev/scss/direction/editor-dark-mode.scss @@ -424,6 +424,7 @@ $devices: 'desktop', 'tablet', 'mobile'; &, &__controls { + background-color: $theme-dark-gray-darkest; border-color: $theme-dark-gray-light; } } From 3c349459c8ef8d429e946171222f4a76c4c95693 Mon Sep 17 00:00:00 2001 From: Rotem Ben-Itzhak Date: Mon, 8 Jun 2020 12:42:12 +0300 Subject: [PATCH 3/7] Changing widgets search input X color in dark mode. --- assets/dev/scss/direction/editor-dark-mode.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/dev/scss/direction/editor-dark-mode.scss b/assets/dev/scss/direction/editor-dark-mode.scss index 5194053b28f..f3c5d537382 100644 --- a/assets/dev/scss/direction/editor-dark-mode.scss +++ b/assets/dev/scss/direction/editor-dark-mode.scss @@ -212,6 +212,15 @@ select { color: $theme-dark-light; } } + + &::-webkit-search-cancel-button { + -webkit-appearance: none; + height: 8px; + width: 8px; + background: + linear-gradient(45deg, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 43%,$theme-dark-gray-lightest 45%,$theme-dark-gray-lightest 55%,rgba(0,0,0,0) 57%,rgba(0,0,0,0) 100%), + linear-gradient(135deg, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 43%,$theme-dark-gray-lightest 45%,$theme-dark-gray-lightest 55%,rgba(0,0,0,0) 57%,rgba(0,0,0,0) 100%); + } } .elementor-element { From 824d36c9b5abc79f2622d5ea232e3c95663610d1 Mon Sep 17 00:00:00 2001 From: Rotem Ben-Itzhak Date: Tue, 9 Jun 2020 12:26:49 +0300 Subject: [PATCH 4/7] Changing mouse cursor to pointer on file selection box. --- assets/dev/scss/editor/panel/controls/_media.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/dev/scss/editor/panel/controls/_media.scss b/assets/dev/scss/editor/panel/controls/_media.scss index 43d4c48bffd..3725adf17be 100644 --- a/assets/dev/scss/editor/panel/controls/_media.scss +++ b/assets/dev/scss/editor/panel/controls/_media.scss @@ -154,6 +154,7 @@ margin-top: 10px; border: 1px solid $editor-lightest; border-radius: 3px; + cursor: pointer; &__content { @include padding-start(5px); From 99eb8a048c5a34a9383577131a59226ed4805d7d Mon Sep 17 00:00:00 2001 From: Rotem Ben-Itzhak Date: Tue, 9 Jun 2020 17:39:48 +0300 Subject: [PATCH 5/7] Removing unnecessary value in gradient. --- assets/dev/scss/direction/editor-dark-mode.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/dev/scss/direction/editor-dark-mode.scss b/assets/dev/scss/direction/editor-dark-mode.scss index f3c5d537382..6b60c0ebe06 100644 --- a/assets/dev/scss/direction/editor-dark-mode.scss +++ b/assets/dev/scss/direction/editor-dark-mode.scss @@ -218,8 +218,8 @@ select { height: 8px; width: 8px; background: - linear-gradient(45deg, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 43%,$theme-dark-gray-lightest 45%,$theme-dark-gray-lightest 55%,rgba(0,0,0,0) 57%,rgba(0,0,0,0) 100%), - linear-gradient(135deg, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 43%,$theme-dark-gray-lightest 45%,$theme-dark-gray-lightest 55%,rgba(0,0,0,0) 57%,rgba(0,0,0,0) 100%); + linear-gradient(45deg, transparent 45%, $theme-dark-gray-lightest 45%, $theme-dark-gray-lightest 55%, transparent 55%), + linear-gradient(135deg, transparent 45%, $theme-dark-gray-lightest 45%, $theme-dark-gray-lightest 55%, transparent 55%); } } From 0faf0bc815157e3fa7e19c052cbdad55ceb22fc5 Mon Sep 17 00:00:00 2001 From: Jonathan Rutheiser Date: Wed, 10 Jun 2020 00:20:27 -0700 Subject: [PATCH 6/7] Rename unfiltered files upload option name --- includes/settings/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/settings/settings.php b/includes/settings/settings.php index ee94ce39ccd..e6cba08217a 100644 --- a/includes/settings/settings.php +++ b/includes/settings/settings.php @@ -623,7 +623,7 @@ protected function create_tabs() { 'desc' => __( 'For troubleshooting server configuration conflicts.', 'elementor' ), ], ], - 'enable_unfiltered_files_upload' => [ + 'unfiltered_files_upload' => [ 'label' => __( 'Enable Unfiltered Files Uploads', 'elementor' ), 'field_args' => [ 'type' => 'select', From 44447a26be40c7f9ad1c2fcc9cf4c809a673d755 Mon Sep 17 00:00:00 2001 From: Kobi Zaltzberg Date: Wed, 10 Jun 2020 11:27:59 +0300 Subject: [PATCH 7/7] Fixed the way repeater control is detected. It fixes #11578 --- assets/dev/js/editor/elements/models/base-settings.js | 2 +- assets/dev/js/editor/utils/helpers.js | 2 +- includes/base/controls-stack.php | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/dev/js/editor/elements/models/base-settings.js b/assets/dev/js/editor/elements/models/base-settings.js index 5920be322ce..d586a3faaf3 100644 --- a/assets/dev/js/editor/elements/models/base-settings.js +++ b/assets/dev/js/editor/elements/models/base-settings.js @@ -235,7 +235,7 @@ BaseSettingsModel = Backbone.Model.extend( { var control = this, valueToParse; - if ( 'repeater' === control.type ) { + if ( control.is_repeater ) { valueToParse = settings[ control.name ]; valueToParse.forEach( function( value, key ) { valueToParse[ key ] = self.parseDynamicSettings( value, options, control.fields ); diff --git a/assets/dev/js/editor/utils/helpers.js b/assets/dev/js/editor/utils/helpers.js index aaa6a24cec8..27fc4983d99 100644 --- a/assets/dev/js/editor/utils/helpers.js +++ b/assets/dev/js/editor/utils/helpers.js @@ -340,7 +340,7 @@ module.exports = { has = true; return false; } - if ( 'repeater' === controlData.type ) { + if ( controlData.is_repeater ) { has = hasControlOfType( controlData.fields, type ); if ( has ) { return false; diff --git a/includes/base/controls-stack.php b/includes/base/controls-stack.php index 91409ee9cfb..9f759bd6214 100644 --- a/includes/base/controls-stack.php +++ b/includes/base/controls-stack.php @@ -1170,7 +1170,7 @@ public function parse_dynamic_settings( $settings, $controls = null, $all_settin continue; } - if ( 'repeater' === $control_obj->get_type() ) { + if ( $control_obj instanceof Control_Repeater ) { foreach ( $settings[ $control_name ] as & $field ) { $field = $this->parse_dynamic_settings( $field, $control['fields'], $field ); } @@ -2002,7 +2002,9 @@ private function sanitize_settings( array $settings, array $controls = [] ) { } foreach ( $controls as $control ) { - if ( 'repeater' === $control['type'] ) { + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] ); + + if ( $control_obj instanceof Control_Repeater ) { if ( empty( $settings[ $control['name'] ] ) ) { continue; }