From 14e6a853013a25fa00295961f0a95770e9bae703 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Fri, 27 Sep 2024 11:24:54 +0400
Subject: [PATCH] Fix sidebar borders (#6752)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 packages/theme/styles/components.scss                      | 3 +++
 .../workbench-resources/src/components/Workbench.svelte    | 2 ++
 .../src/components/sidebar/SidebarExpanded.svelte          | 3 ---
 .../src/components/sidebar/SidebarMini.svelte              | 2 +-
 .../src/components/sidebar/widgets/WidgetsBar.svelte       | 7 +------
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/theme/styles/components.scss b/packages/theme/styles/components.scss
index 162151088a..d0edf20d4b 100644
--- a/packages/theme/styles/components.scss
+++ b/packages/theme/styles/components.scss
@@ -23,6 +23,9 @@
   min-width: 0;
   border: 1px solid var(--theme-divider-color); // var(--global-surface-02-BorderColor);
   border-radius: var(--small-focus-BorderRadius);
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+  border-right: 0;
 
   &:not(.modal) {
     background-color: var(--theme-panel-color); // var(--global-surface-02-BackgroundColor);
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index 9887148967..cde59e8963 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -910,6 +910,8 @@
       inset: 0;
       border: 1px solid var(--theme-divider-color);
       border-radius: var(--medium-BorderRadius);
+      border-bottom-right-radius: 0;
+      border-top-right-radius: 0;
       pointer-events: none;
     }
     .antiPanel-application {
diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
index 880d765e1d..ab4873ff69 100644
--- a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
@@ -165,10 +165,7 @@
     width: calc(100% - 3.5rem);
     height: 100%;
     background: var(--theme-panel-color);
-
     border-right: 1px solid var(--global-ui-BorderColor);
-    border-top-left-radius: var(--small-focus-BorderRadius);
-    border-bottom-left-radius: var(--small-focus-BorderRadius);
   }
 
   .component {
diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarMini.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarMini.svelte
index 7b5cf463d9..24acec8ce5 100644
--- a/plugins/workbench-resources/src/components/sidebar/SidebarMini.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/SidebarMini.svelte
@@ -23,4 +23,4 @@
   export let selected: Ref<Widget> | undefined = undefined
 </script>
 
-<WidgetsBar {widgets} {preferences} {selected} roundBorder />
+<WidgetsBar {widgets} {preferences} {selected} />
diff --git a/plugins/workbench-resources/src/components/sidebar/widgets/WidgetsBar.svelte b/plugins/workbench-resources/src/components/sidebar/widgets/WidgetsBar.svelte
index fbdb5d4b41..5f5717b4db 100644
--- a/plugins/workbench-resources/src/components/sidebar/widgets/WidgetsBar.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/widgets/WidgetsBar.svelte
@@ -24,7 +24,6 @@
   export let widgets: Widget[] = []
   export let preferences: WidgetPreference[] = []
   export let selected: Ref<Widget> | undefined = undefined
-  export let roundBorder = false
 
   function handleAddWidget (): void {
     showPopup(AddWidgetsPopup, { widgets })
@@ -49,7 +48,7 @@
     .filter((widget): widget is Widget => widget !== undefined && widget.type === WidgetType.Configurable)
 </script>
 
-<div class="root" class:roundBorder>
+<div class="root">
   <div class="block">
     {#each fixedWidgets as widget}
       <WidgetPresenter
@@ -104,10 +103,6 @@
     max-width: 3.5rem;
     border-top: 1px solid var(--theme-divider-color);
     overflow-y: auto;
-
-    &.roundBorder {
-      border-top-left-radius: var(--small-focus-BorderRadius);
-    }
   }
 
   .block {