Skip to content

Commit

Permalink
Merge pull request #246 from davseve/some-branch-to-test-skip-release…
Browse files Browse the repository at this point in the history
…-on-ED-11967

Some branch to test skip release on ED-11967
  • Loading branch information
davseve authored Sep 7, 2023
2 parents 4924349 + b83dd2a commit 25fbdd0
Show file tree
Hide file tree
Showing 34 changed files with 303 additions and 238 deletions.
10 changes: 5 additions & 5 deletions app/modules/onboarding/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private function get_permission_error_response() {
return [
'status' => 'error',
'payload' => [
'error_message' => esc_html__( 'you are not allowed to perform this action', 'elementor' ),
'error_message' => esc_html__( 'You do not have permissions to perform this action.', 'elementor' ),
],
];
}
Expand All @@ -147,7 +147,7 @@ private function maybe_update_site_name() {
$problem_error = [
'status' => 'error',
'payload' => [
'error_message' => esc_html__( 'There was a problem setting your site name', 'elementor' ),
'error_message' => esc_html__( 'There was a problem setting your site name.', 'elementor' ),
],
];

Expand Down Expand Up @@ -204,7 +204,7 @@ private function maybe_update_site_logo() {
$data_error = [
'status' => 'error',
'payload' => [
'error_message' => esc_html__( 'There was a problem setting your site logo', 'elementor' ),
'error_message' => esc_html__( 'There was a problem setting your site logo.', 'elementor' ),
],
];

Expand Down Expand Up @@ -254,7 +254,7 @@ private function maybe_update_site_logo() {
* @return array
*/
private function maybe_upload_logo_image() {
$error_message = esc_html__( 'There was a problem uploading your file', 'elementor' );
$error_message = esc_html__( 'There was a problem uploading your file.', 'elementor' );

$file = Utils::get_super_global_value( $_FILES, 'fileToUpload' );

Expand Down Expand Up @@ -339,7 +339,7 @@ private function upload_and_install_pro() {
return $this->get_permission_error_response();
}

$error_message = esc_html__( 'There was a problem uploading your file', 'elementor' );
$error_message = esc_html__( 'There was a problem uploading your file.', 'elementor' );

$file = Utils::get_super_global_value( $_FILES, 'fileToUpload' ) ?? [];

Expand Down
2 changes: 1 addition & 1 deletion assets/dev/js/editor/components/settings/base/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ module.exports = elementorModules.ViewModule.extend( {
},
error() {
// eslint-disable-next-line no-alert
alert( 'An error occurred' );
alert( 'An error occurred.' );
},
} );
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ TemplateLibraryManager = function() {
if ( ! errorDialog ) {
errorDialog = elementorCommon.dialogsManager.createWidget( 'alert', {
id: 'elementor-template-library-error-dialog',
headerMessage: __( 'An error occurred', 'elementor' ),
headerMessage: __( 'An error occurred.', 'elementor' ),
} );
}

Expand Down
14 changes: 9 additions & 5 deletions assets/dev/js/editor/elements/views/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ BaseElementView = BaseContainer.extend( {
.listenTo( this.model, 'request:toggleVisibility', this.toggleVisibility );

this.initControlsCSSParser();

if ( ! this.onDynamicServerRequestEnd ) {
this.onDynamicServerRequestEnd = _.debounce( () => {
this.render();

this.$el.removeClass( 'elementor-loading' );
}, 100 );
}
},

getHandlesOverlay() {
Expand Down Expand Up @@ -788,11 +796,7 @@ BaseElementView = BaseContainer.extend( {
onServerRequestStart() {
self.$el.addClass( 'elementor-loading' );
},
onServerRequestEnd() {
self.render();

self.$el.removeClass( 'elementor-loading' );
},
onServerRequestEnd: self.onDynamicServerRequestEnd,
};
},

Expand Down
26 changes: 13 additions & 13 deletions assets/dev/scss/frontend/widgets/rating.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.elementor-widget-rating {
--e-rating-gap: 0px;
--e-rating-star-font-size: 16px;
--e-rating-star-color: #{$gray-mouse};
--e-rating-star-marked-color: #{$orange};
--e-rating-star-marked-width: 100%;
--e-rating-icon-font-size: 16px;
--e-rating-icon-color: #{$gray-mouse};
--e-rating-icon-marked-color: #{$orange};
--e-rating-icon-marked-width: 100%;
--e-rating-justify-content: flex-start;

.e-rating {
Expand All @@ -17,14 +17,14 @@
width: fit-content;
}

.e-star {
.e-icon {
position: relative;

&-wrapper {

&.e-star-marked {
--e-rating-star-color: var(--e-rating-star-marked-color);
width: var(--e-rating-star-marked-width);
&.e-icon-marked {
--e-rating-icon-color: var(--e-rating-icon-marked-color);
width: var(--e-rating-icon-marked-width);
position: absolute;
z-index: $first-layer;
height: 100%;
Expand All @@ -39,14 +39,14 @@
}

i {
font-size: var(--e-rating-star-font-size);
color: var(--e-rating-star-color);
font-size: var(--e-rating-icon-font-size);
color: var(--e-rating-icon-color);
}

svg {
width: var(--e-rating-star-font-size);
height: var(--e-rating-star-font-size);
fill: var(--e-rating-star-color);
width: var(--e-rating-icon-font-size);
height: var(--e-rating-icon-font-size);
fill: var(--e-rating-icon-color);
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions core/admin/admin-notices.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,7 @@ private function notice_rate_us_feedback() {

$options = [
'title' => esc_html__( 'Congrats!', 'elementor' ),
'description' => esc_html__( 'You created over 10 pages with Elementor. Great job! If you can spare a minute,
please help us by leaving a five star review on WordPress.org.', 'elementor' ),
'description' => esc_html__( 'You created over 10 pages with Elementor. Great job! If you can spare a minute, please help us by leaving a five star review on WordPress.org.', 'elementor' ),
'id' => $notice_id,
'button' => [
'text' => esc_html__( 'Happy To Help', 'elementor' ),
Expand Down
Loading

0 comments on commit 25fbdd0

Please sign in to comment.