From 3ea330b9815fee0828dfef44904945208563f61d Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 27 Mar 2024 18:19:00 +0000
Subject: [PATCH] fix: comment view styling (#7965)

---
 core/comments/comment_view.ts                  | 9 ++-------
 media/delete-icon.svg                          | 1 +
 media/{arrow-dropdown.svg => foldout-icon.svg} | 0
 3 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 media/delete-icon.svg
 rename media/{arrow-dropdown.svg => foldout-icon.svg} (100%)

diff --git a/core/comments/comment_view.ts b/core/comments/comment_view.ts
index 62d0c69eb..294f68ef3 100644
--- a/core/comments/comment_view.ts
+++ b/core/comments/comment_view.ts
@@ -167,7 +167,7 @@ export class CommentView implements IRenderedElement {
       Svg.IMAGE,
       {
         'class': 'blocklyFoldoutIcon',
-        'href': `${workspace.options.pathToMedia}arrow-dropdown.svg`,
+        'href': `${workspace.options.pathToMedia}foldout-icon.svg`,
       },
       topBarGroup,
     );
@@ -736,7 +736,6 @@ css.register(`
 .blocklyWorkspace {
   --commentFillColour: #FFFCC7;
   --commentBorderColour: #F2E49B;
-  --commentIconColour: #1A1A1A
 }
 
 .blocklyComment .blocklyTextarea {
@@ -759,22 +758,18 @@ css.register(`
 .blocklyDeleteIcon {
   width: 20px;
   height: 20px;
-  display: none;
-  fill: var(--commentIconColour);
   cursor: pointer;
 }
 
 .blocklyFoldoutIcon {
   width: 20px;
   height: 20px;
-  fill: var(--commentIconColour);
   transform-origin: 12px 12px;
   cursor: pointer;
 }
 .blocklyResizeHandle {
   width: 12px;
   height: 12px;
-  stroke: var(--commentIconColour);
   cursor: se-resize;
 }
 
@@ -784,7 +779,7 @@ css.register(`
 }
 
 .blocklyComment .blocklyCommentPreview.blocklyText {
-  fill: var(--commentIconColour);
+  fill: #000;
   dominant-baseline: middle;
   visibility: hidden;
 }
diff --git a/media/delete-icon.svg b/media/delete-icon.svg
new file mode 100644
index 000000000..1bd27ee73
--- /dev/null
+++ b/media/delete-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="#041E49"><path d="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520ZM360-280h80v-360h-80v360Zm160 0h80v-360h-80v360ZM280-720v520-520Z"/></svg>
\ No newline at end of file
diff --git a/media/arrow-dropdown.svg b/media/foldout-icon.svg
similarity index 100%
rename from media/arrow-dropdown.svg
rename to media/foldout-icon.svg