fix: merge conflicts, merge

2025-06-24 08:22:24 +03:00
parent e29e0892ac 612d0d8c15
commit 65bff0d2da
9 changed files with 307 additions and 81 deletions
--- a/apps/web/src/app/editor/editor.css
+++ b/apps/web/src/app/editor/editor.css
@ -0,0 +1,4 @@
+/* Prevent scroll jumping on Mac devices when using the editor */
+body {
+  overflow: hidden;
+} 
--- a/apps/web/src/app/editor/page.tsx
+++ b/apps/web/src/app/editor/page.tsx
@ -1,6 +1,7 @@
 "use client";

 import { useEffect } from "react";
+import "./editor.css";
 import {
  ResizablePanelGroup,
  ResizablePanel,