Merge remote-tracking branch 'elementor/release/3.0.0' into feature/app

Author: matipojo

.grunt-config/webpack.js

@@ -75,7 +75,6 @@ const entry = {
 	'editor-document': path.resolve( __dirname, '../assets/dev/js/editor/editor-document.js' ),
 	'frontend-modules': path.resolve( __dirname, '../assets/dev/js/frontend/modules.js' ),
 	'qunit-tests': path.resolve( __dirname, '../tests/qunit/main.js' ),
-	'screenshot': path.resolve( __dirname, '../modules/screenshots/assets/js/preview/screenshot.js' ),
 };
 
 const externals = {

assets/dev/js/editor/components/settings/page/manager.js

@@ -69,6 +69,7 @@ module.exports = BaseSettings.extend( {
 				view: {
 					lookup: () => container,
 					renderOnChange: () => this.updateStylesheet(),
+					renderUI: () => this.updateStylesheet(),
 				},
 			},
 		} );

assets/dev/js/editor/editor-base.js

@@ -14,7 +14,6 @@ import Navigator from './regions/navigator/navigator';
 import NoticeBar from './utils/notice-bar';
 import Preview from 'elementor-views/preview';
 import PopoverToggleControl from 'elementor-controls/popover-toggle';
-import ScreenshotsModule from 'elementor/modules/screenshots/assets/js/editor/module';
 
 const DEFAULT_DEVICE_MODE = 'desktop';
 
@@ -38,7 +37,6 @@ export default class EditorBase extends Marionette.Application {
 	ajax = elementorCommon.ajax;
 	conditions = require( 'elementor-editor-utils/conditions' );
 	history = require( 'elementor/modules/history/assets/js/module' );
-	screenshots = new ScreenshotsModule();
 
 	channels = {
 		editor: Backbone.Radio.channel( 'ELEMENTOR:editor' ),

assets/dev/scss/direction/editor-dark-mode.scss

@@ -1161,6 +1161,13 @@ label.elementor-template-library-order-label,
 			}
 		}
 
+		.elementor-control-type-select {
+
+			.elementor-control-input-wrapper:after {
+				color: inherit;
+			}
+		}
+
 		.elementor-theme-builder-conditions-repeater-row-controls {
 
 			.elementor-control:not(:first-child) {

assets/dev/scss/editor/panel/controls/_globals.scss

@@ -24,18 +24,24 @@
 			box-shadow: 0 2px 15px rgba(0, 0, 0, 0.3);
 			border-radius: 3px;
 			background-color: #fff;
+			padding-bottom: 5px;
 		}
 
 		&-title {
 			padding: 15px 20px;
 			font-weight: bold;
 			color: $editor-dark;
 			border-bottom: 1px solid $editor-background;
+			display: flex;
 
-			i {
+			& > i {
 				@include margin-end(5px);
 				color: $editor-lightest;
 			}
+
+			&-text {
+				flex-grow: 1;
+			}
 		}
 
 		&-info {
@@ -70,7 +76,7 @@
 	&__preview-items-container {
 		max-height: 260px;
 		overflow-y: auto;
-		margin: 5px 0;
+		margin-top: 5px;
 
 		&::-webkit-scrollbar {
 			width: 8px;
@@ -84,18 +90,15 @@
 	}
 
 	&__manage-button {
-		color: $editor-dark;
 		font-weight: 500;
-		padding: 15px 20px;
-		border-top: 1px solid $editor-background;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
 		cursor: pointer;
 
-		&:hover {
-			background-color: $editor-kit-accent;
-			color: #fff;
+		&:hover i {
+				color: $editor-kit-accent;
+		}
+
+		i {
+			color: $editor-dark;
 		}
 	}
 

assets/dev/scss/frontend/_global.scss

@@ -31,8 +31,15 @@
 		box-shadow: none;
 	}
 
-	.elementor-widget:not(.elementor-widget-text-editor) figure {
-		margin: 0;
+	.elementor-widget {
+
+		// Classic Editor & Gutenberg Compatibility
+		&:not(.elementor-widget-text-editor):not(.elementor-widget-theme-post-content) {
+
+			figure {
+				margin: 0;
+			}
+		}
 	}
 
 	// Responsive Embed