Merge pull request #133 from frappe/develop

frappe · Apr 17, 2024 · 9ff5eda · 9ff5eda
2 parents 3547567 + c87b997
commit 9ff5eda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/builder/builder/doctype/builder_page/builder_page.py b/builder/builder/doctype/builder_page/builder_page.py
@@ -509,7 +509,7 @@ def get_style_file_path():
 
 
 def escape_single_quotes(text):
-	return text.replace("'", "\\'")
+	return (text or "").replace("'", "\\'")
 
 
 # def generate_tailwind_css_file_from_html(html):

diff --git a/frontend/src/components/BuilderCanvas.vue b/frontend/src/components/BuilderCanvas.vue
@@ -4,7 +4,7 @@
 		<div class="overlay absolute" id="overlay" ref="overlay" />
 		<Transition name="fade">
 			<div
-				class="absolute bottom-0 left-0 right-0 top-0 z-50 w-full bg-gray-200 p-10 dark:bg-zinc-800"
+				class="absolute bottom-0 left-0 right-0 top-0 z-40 w-full bg-gray-200 p-10 dark:bg-zinc-800"
 				v-show="store.settingPage"></div>
 		</Transition>
 		<BlockSnapGuides></BlockSnapGuides>

diff --git a/frontend/src/utils/block.ts b/frontend/src/utils/block.ts
@@ -366,6 +366,13 @@ class Block implements BlockOptions {
 		if (childBlock.isText()) {
 			childBlock.makeBlockEditable();
 		}
+
+		if (childBlock.getStyle("position")) {
+			if (!this.getStyle("position")) {
+				this.setStyle("position", "relative");
+			}
+		}
+
 		return childBlock;
 	}
 	removeChild(child: Block) {