From 1209efb63c47c32b119ea130e4c7d411a836e3e4 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:09:18 -0500
Subject: [PATCH] FIX: Adjust border-radius in multiple locations (#23278)

---
 app/assets/stylesheets/common/admin/customize.scss  | 12 ++++++++++++
 app/assets/stylesheets/common/base/menu-panel.scss  |  3 +++
 app/assets/stylesheets/common/base/search-menu.scss |  2 ++
 app/assets/stylesheets/common/components/navs.scss  |  7 +++++++
 4 files changed, 24 insertions(+)

diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 39b75d4b0b6..fffd0f11770 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -209,6 +209,16 @@
       width: 50%;
       box-sizing: border-box;
       text-align: center;
+      &.themes-tab {
+        border-top-right-radius: 0px;
+        border-bottom-left-radius: 0px;
+        border-bottom-right-radius: 0px;
+      }
+      &.components-tab {
+        border-top-left-radius: 0px;
+        border-bottom-left-radius: 0px;
+        border-bottom-right-radius: 0px;
+      }
 
       &.active {
         background-color: var(--quaternary);
@@ -228,6 +238,8 @@
     overflow-y: auto;
     box-sizing: border-box;
     max-height: 60vh;
+    border-bottom-right-radius: var(--d-border-radius);
+    border-bottom-left-radius: var(--d-border-radius);
     @media screen and (max-height: 1000px) {
       max-height: 50vh;
     }
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 763f610c907..40d71e18bb2 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -17,6 +17,7 @@
   top: 100%; // directly underneath .panel
   right: -10px; // 10px to the right of .panel - adjust as needed
   max-height: 80vh;
+  border-radius: var(--d-border-radius-large);
 }
 
 .menu-panel {
@@ -100,6 +101,7 @@
   right: 0;
   width: 320px;
   padding: 0;
+  border-top-right-radius: 0px;
 
   .panel-body-bottom {
     flex: 0;
@@ -122,6 +124,7 @@
       display: flex;
       padding: 0.857em;
       position: relative;
+      border-radius: 0px;
 
       .d-icon {
         color: var(--primary-medium);
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 016e400966a..ab3af0c12e0 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -25,6 +25,8 @@ $search-pad-horizontal: 0.5em;
     display: flex;
     align-items: center;
     border: 1px solid var(--primary-medium);
+    border-radius: var(--d-border-radius-large);
+    overflow: hidden;
     input#search-term {
       border-width: 0;
       margin-bottom: 0;
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 89137902c8f..56c8c00a1cd 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -124,3 +124,10 @@
     line-height: var(--line-height-large);
   }
 }
+
+.user-navigation .nav-pills > li {
+  a,
+  button {
+    border-radius: 0px;
+  }
+}