From b6d550d23ca51035b8dbe6f848da16546f67c145 Mon Sep 17 00:00:00 2001
From: Plane Bot <146718762+plane-bot@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:37:28 +0530
Subject: [PATCH] [WEB-1984] fix: code block padding and margin in pages.
 (#5152) (#645)

Co-authored-by: Prateek Shourya <prateekshourya29@gmail.com>
Co-authored-by: guru_sainath <gurusainath007@gmail.com>
---
 packages/editor/src/core/extensions/code-inline/index.tsx   | 2 +-
 .../src/core/extensions/code/code-block-node-view.tsx       | 6 +++---
 web/ee/components/issues/activity/root.tsx                  | 1 -
 web/ee/components/issues/activity/worklog-create-button.tsx | 1 -
 web/ee/components/issues/index.ts                           | 1 +
 web/ee/components/issues/properties/root.tsx                | 1 -
 web/ee/components/issues/{ => worklog}/activity/index.ts    | 0
 web/ee/{ => components}/issues/worklog/activity/root.tsx    | 0
 .../issues/worklog/activity/worklog-create-button.tsx       | 0
 web/ee/{ => components}/issues/worklog/index.ts             | 0
 .../issues/{properties => worklog/property}/index.ts        | 0
 web/ee/{ => components}/issues/worklog/property/root.tsx    | 0
 web/ee/issues/index.ts                                      | 2 --
 web/ee/issues/worklog/activity/index.ts                     | 2 --
 web/ee/issues/worklog/property/index.ts                     | 1 -
 15 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 web/ee/components/issues/activity/root.tsx
 delete mode 100644 web/ee/components/issues/activity/worklog-create-button.tsx
 delete mode 100644 web/ee/components/issues/properties/root.tsx
 rename web/ee/components/issues/{ => worklog}/activity/index.ts (100%)
 rename web/ee/{ => components}/issues/worklog/activity/root.tsx (100%)
 rename web/ee/{ => components}/issues/worklog/activity/worklog-create-button.tsx (100%)
 rename web/ee/{ => components}/issues/worklog/index.ts (100%)
 rename web/ee/components/issues/{properties => worklog/property}/index.ts (100%)
 rename web/ee/{ => components}/issues/worklog/property/root.tsx (100%)
 delete mode 100644 web/ee/issues/index.ts
 delete mode 100644 web/ee/issues/worklog/activity/index.ts
 delete mode 100644 web/ee/issues/worklog/property/index.ts

diff --git a/packages/editor/src/core/extensions/code-inline/index.tsx b/packages/editor/src/core/extensions/code-inline/index.tsx
index 70270355d6..6e023b6ed1 100644
--- a/packages/editor/src/core/extensions/code-inline/index.tsx
+++ b/packages/editor/src/core/extensions/code-inline/index.tsx
@@ -33,7 +33,7 @@ export const CustomCodeInlineExtension = Mark.create<CodeOptions>({
     return {
       HTMLAttributes: {
         class:
-          "rounded bg-custom-background-80 px-1 py-[2px] font-mono font-medium text-orange-500 border-[0.5px] border-custom-border-200",
+          "rounded bg-custom-background-80 px-[6px] py-[1.5px] font-mono font-medium text-orange-500 border-[0.5px] border-custom-border-200",
         spellcheck: "false",
       },
     };
diff --git a/packages/editor/src/core/extensions/code/code-block-node-view.tsx b/packages/editor/src/core/extensions/code/code-block-node-view.tsx
index 474813bb6b..b383b4c815 100644
--- a/packages/editor/src/core/extensions/code/code-block-node-view.tsx
+++ b/packages/editor/src/core/extensions/code/code-block-node-view.tsx
@@ -40,9 +40,9 @@ export const CodeBlockComponent: React.FC<CodeBlockComponentProps> = ({ node })
         <button
           type="button"
           className={cn(
-            "group/button hidden group-hover/code:flex items-center justify-center absolute top-2 right-2 z-10 size-8 rounded-md bg-custom-background-80 border border-custom-border-200 transition duration-150 ease-in-out",
+            "group/button hidden group-hover/code:flex items-center justify-center absolute top-2 right-2 z-10 size-8 rounded-md bg-custom-background-80 border border-custom-border-200 transition duration-150 ease-in-out backdrop-blur-sm",
             {
-              "bg-green-500/10 hover:bg-green-500/10 active:bg-green-500/10": copied,
+              "bg-green-500/30 hover:bg-green-500/30 active:bg-green-500/30": copied,
             }
           )}
           onClick={copyToClipboard}
@@ -55,7 +55,7 @@ export const CodeBlockComponent: React.FC<CodeBlockComponentProps> = ({ node })
         </button>
       </Tooltip>
 
-      <pre className="bg-custom-background-90 text-custom-text-100 rounded-lg p-8 pl-9 pr-4">
+      <pre className="bg-custom-background-90 text-custom-text-100 rounded-lg p-4 my-2">
         <NodeViewContent as="code" className="whitespace-[pre-wrap]" />
       </pre>
     </NodeViewWrapper>
diff --git a/web/ee/components/issues/activity/root.tsx b/web/ee/components/issues/activity/root.tsx
deleted file mode 100644
index 0013dcb4be..0000000000
--- a/web/ee/components/issues/activity/root.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "@/plane-web/components/issues/worklog/activity/root";
diff --git a/web/ee/components/issues/activity/worklog-create-button.tsx b/web/ee/components/issues/activity/worklog-create-button.tsx
deleted file mode 100644
index 1e59244331..0000000000
--- a/web/ee/components/issues/activity/worklog-create-button.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "@/plane-web/components/issues/worklog/activity/worklog-create-button";
diff --git a/web/ee/components/issues/index.ts b/web/ee/components/issues/index.ts
index 10ceba0260..52eeed8937 100644
--- a/web/ee/components/issues/index.ts
+++ b/web/ee/components/issues/index.ts
@@ -1 +1,2 @@
 export * from "./bulk-operations";
+export * from "./worklog";
\ No newline at end of file
diff --git a/web/ee/components/issues/properties/root.tsx b/web/ee/components/issues/properties/root.tsx
deleted file mode 100644
index eb05536139..0000000000
--- a/web/ee/components/issues/properties/root.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "@/plane-web/components/issues/worklog/property/root";
diff --git a/web/ee/components/issues/activity/index.ts b/web/ee/components/issues/worklog/activity/index.ts
similarity index 100%
rename from web/ee/components/issues/activity/index.ts
rename to web/ee/components/issues/worklog/activity/index.ts
diff --git a/web/ee/issues/worklog/activity/root.tsx b/web/ee/components/issues/worklog/activity/root.tsx
similarity index 100%
rename from web/ee/issues/worklog/activity/root.tsx
rename to web/ee/components/issues/worklog/activity/root.tsx
diff --git a/web/ee/issues/worklog/activity/worklog-create-button.tsx b/web/ee/components/issues/worklog/activity/worklog-create-button.tsx
similarity index 100%
rename from web/ee/issues/worklog/activity/worklog-create-button.tsx
rename to web/ee/components/issues/worklog/activity/worklog-create-button.tsx
diff --git a/web/ee/issues/worklog/index.ts b/web/ee/components/issues/worklog/index.ts
similarity index 100%
rename from web/ee/issues/worklog/index.ts
rename to web/ee/components/issues/worklog/index.ts
diff --git a/web/ee/components/issues/properties/index.ts b/web/ee/components/issues/worklog/property/index.ts
similarity index 100%
rename from web/ee/components/issues/properties/index.ts
rename to web/ee/components/issues/worklog/property/index.ts
diff --git a/web/ee/issues/worklog/property/root.tsx b/web/ee/components/issues/worklog/property/root.tsx
similarity index 100%
rename from web/ee/issues/worklog/property/root.tsx
rename to web/ee/components/issues/worklog/property/root.tsx
diff --git a/web/ee/issues/index.ts b/web/ee/issues/index.ts
deleted file mode 100644
index 1aa924b41b..0000000000
--- a/web/ee/issues/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./worklog/activity";
-export * from "./worklog/property";
diff --git a/web/ee/issues/worklog/activity/index.ts b/web/ee/issues/worklog/activity/index.ts
deleted file mode 100644
index 6060c4afc1..0000000000
--- a/web/ee/issues/worklog/activity/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./root";
-export * from "./worklog-create-button";
diff --git a/web/ee/issues/worklog/property/index.ts b/web/ee/issues/worklog/property/index.ts
deleted file mode 100644
index 1efe34c51e..0000000000
--- a/web/ee/issues/worklog/property/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./root";