From 307ee65bb08c685d9728806bb24b618c0756b826 Mon Sep 17 00:00:00 2001 From: Krum Angelov Date: Mon, 1 Dec 2025 12:46:35 +0200 Subject: [PATCH 1/5] fix: add background-color to element so the arrow is the same colour too --- .../scratch-gui/src/components/action-menu/action-menu.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.css b/packages/scratch-gui/src/components/action-menu/action-menu.css index 03be98cace..da4f6138fd 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.css +++ b/packages/scratch-gui/src/components/action-menu/action-menu.css @@ -140,10 +140,6 @@ button::-moz-focus-inner { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; } -.tooltip:after { - background-color: $extensions-primary; -} - .coming-soon-tooltip { background-color: $data-primary !important; } @@ -165,6 +161,7 @@ $arrow-inset: -0.25rem; $arrow-rounding: 0.125rem; .tooltip:after { + background-color: $extensions-primary !important; content: ""; border-top: 1px solid hsla(0, 0%, 0%, .1) !important; border-left: 0 !important; From 97f416a1e3c562f0b36fe855d712ce91978b0fa0 Mon Sep 17 00:00:00 2001 From: Krum Angelov Date: Mon, 1 Dec 2025 12:46:35 +0200 Subject: [PATCH 2/5] fix: add background-color to element so the arrow is the same colour too --- .../scratch-gui/src/components/action-menu/action-menu.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.css b/packages/scratch-gui/src/components/action-menu/action-menu.css index 03be98cace..da4f6138fd 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.css +++ b/packages/scratch-gui/src/components/action-menu/action-menu.css @@ -140,10 +140,6 @@ button::-moz-focus-inner { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; } -.tooltip:after { - background-color: $extensions-primary; -} - .coming-soon-tooltip { background-color: $data-primary !important; } @@ -165,6 +161,7 @@ $arrow-inset: -0.25rem; $arrow-rounding: 0.125rem; .tooltip:after { + background-color: $extensions-primary !important; content: ""; border-top: 1px solid hsla(0, 0%, 0%, .1) !important; border-left: 0 !important; From 249d686f3903eed254ff52e1a833aa81cb9f5f4e Mon Sep 17 00:00:00 2001 From: Krum Angelov Date: Mon, 1 Dec 2025 14:54:27 +0200 Subject: [PATCH 3/5] fix: implemented same logic with imported css color passed to jsx component to be used as a param --- .../scratch-gui/src/components/action-menu/action-menu.css | 4 ++-- .../scratch-gui/src/components/action-menu/action-menu.jsx | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.css b/packages/scratch-gui/src/components/action-menu/action-menu.css index da4f6138fd..f7dbc90258 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.css +++ b/packages/scratch-gui/src/components/action-menu/action-menu.css @@ -154,6 +154,7 @@ button::-moz-focus-inner { box-shadow: 0 0 .5rem hsla(0, 0%, 0%, .25) !important; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; z-index: $z-index-tooltip !important; + --tooltip-arrow-color: $extensions-primary; } $arrow-size: 0.5rem; @@ -161,7 +162,6 @@ $arrow-inset: -0.25rem; $arrow-rounding: 0.125rem; .tooltip:after { - background-color: $extensions-primary !important; content: ""; border-top: 1px solid hsla(0, 0%, 0%, .1) !important; border-left: 0 !important; @@ -194,4 +194,4 @@ $arrow-rounding: 0.125rem; margin-left: $arrow-inset !important; top: $arrow-inset !important; transform: rotate(-45deg) !important; -} +} \ No newline at end of file diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.jsx b/packages/scratch-gui/src/components/action-menu/action-menu.jsx index f9e50f3ff6..60fe7700f0 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.jsx +++ b/packages/scratch-gui/src/components/action-menu/action-menu.jsx @@ -138,6 +138,7 @@ class ActionMenu extends React.Component { effect="solid" id={this.mainTooltipId} place={tooltipPlace || 'left'} + arrowColor="var(--tooltip-arrow-color)" />
@@ -179,6 +180,7 @@ class ActionMenu extends React.Component { effect="solid" id={tooltipId} place={tooltipPlace || 'left'} + arrowColor="var(--tooltip-arrow-color)" />
); From d9a651d5d8e330a79ba3bcef8068daa628fbb6ea Mon Sep 17 00:00:00 2001 From: Krum Angelov Date: Mon, 1 Dec 2025 15:03:20 +0200 Subject: [PATCH 4/5] fix: removed unnecessary lines and brought back wrongly deleted --- .../scratch-gui/src/components/action-menu/action-menu.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.css b/packages/scratch-gui/src/components/action-menu/action-menu.css index aa2a04f2ad..bb23bc3bac 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.css +++ b/packages/scratch-gui/src/components/action-menu/action-menu.css @@ -140,6 +140,10 @@ button::-moz-focus-inner { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; } +.tooltip:after { + background-color: $extensions-primary; +} + .coming-soon-tooltip { background-color: $data-primary !important; } @@ -162,7 +166,6 @@ $arrow-inset: -0.25rem; $arrow-rounding: 0.125rem; .tooltip:after { - background-color: $extensions-primary !important; content: ""; border-top: 1px solid hsla(0, 0%, 0%, .1) !important; border-left: 0 !important; From 6f0ba0d6d735fc0a970ff5005e970cb7455d7813 Mon Sep 17 00:00:00 2001 From: Krum Angelov Date: Mon, 1 Dec 2025 15:12:31 +0200 Subject: [PATCH 5/5] chore: deleted lines --- .../scratch-gui/src/components/action-menu/action-menu.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/scratch-gui/src/components/action-menu/action-menu.css b/packages/scratch-gui/src/components/action-menu/action-menu.css index bb23bc3bac..f7dbc90258 100644 --- a/packages/scratch-gui/src/components/action-menu/action-menu.css +++ b/packages/scratch-gui/src/components/action-menu/action-menu.css @@ -140,10 +140,6 @@ button::-moz-focus-inner { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; } -.tooltip:after { - background-color: $extensions-primary; -} - .coming-soon-tooltip { background-color: $data-primary !important; }