merge

kobizz · Jul 4, 2017 · 971c8cb · 971c8cb
2 parents 8cc3374 + 9c2fdb0
commit 971c8cb
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 24 deletions.
diff --git a/assets/css/editor-preview-rtl.css b/assets/css/editor-preview-rtl.css
diff --git a/assets/css/editor-preview-rtl.min.css b/assets/css/editor-preview-rtl.min.css
diff --git a/assets/css/editor-preview.css b/assets/css/editor-preview.css
diff --git a/assets/css/editor-preview.min.css b/assets/css/editor-preview.min.css
diff --git a/assets/dev/scss/editor/_compatibility.scss b/assets/dev/scss/editor/_compatibility.scss
@@ -3,24 +3,35 @@
 
 body.elementor-editor-active {
 
-	// Hack for pojo.me themes
-	&.layout-section {
+	.elementor {
 
-		.entry-content {
-			overflow: visible;
-		}
-	}
+		&.elementor-edit-mode {
 
-	// Hack for bluchic.com themes
-	.article {
-		overflow: visible;
-	}
+			// Hack for pojo.me themes
+			&.layout-section {
+
+				.entry-content {
+					overflow: visible;
+				}
+			}
+
+			// Hack for bluchic.com themes
+			.article {
+				overflow: visible;
+			}
+
+			// Hack for Zerif Pro theme
+			.elementor-element-overlay {
 
-	// Hack for Zerif Pro theme
-	.elementor-element-overlay {
+				.elementor-editor-element-settings {
+					clear: unset;
+				}
+			}
 
-		.elementor-editor-element-settings {
-			clear: unset;
+			// Hack for some stupid themes
+			.elementor-element.elementor-section {
+				overflow: visible;
+			}
 		}
 	}
 }

diff --git a/includes/elements/column.php b/includes/elements/column.php
@@ -116,7 +116,7 @@ protected function _register_controls() {
 			'nav',
 		];
 
-		$options = [ '' => __( 'Default', '' ) ] + array_combine( $possible_tags, $possible_tags );
+		$options = [ '' => __( 'Default', 'elementor' ) ] + array_combine( $possible_tags, $possible_tags );
 
 		$this->add_control(
 			'html_tag',

diff --git a/includes/elements/section.php b/includes/elements/section.php
@@ -327,7 +327,7 @@ protected function _register_controls() {
 			'div',
 		];
 
-		$options = [ '' => __( 'Default', '' ) ] + array_combine( $possible_tags, $possible_tags );
+		$options = [ '' => __( 'Default', 'elementor' ) ] + array_combine( $possible_tags, $possible_tags );
 
 		$this->add_control(
 			'html_tag',