From a07a1ecc41c809190b0ab56503493d7da5f68bd9 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Mon, 9 Aug 2021 16:04:09 -0700
Subject: [PATCH] Fix Kibana nav CSS overrides leaking into other plugins
 (#107973)

- Because we were previously not scoping our Kibana CSS overrides, loading the Enterprise Search plugin and then another plugin would cause that CSS to leak
---
 .../applications/shared/layout/beta.scss      | 21 +++++++++++--------
 .../shared/layout/page_template.tsx           |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
index 677767c190f0e..adf2dc16d8327 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
@@ -6,15 +6,18 @@
  */
 
 @include euiBreakpoint('m', 'l', 'xl') {
-  .kbnPageTemplateSolutionNav {
-    display: flex;
-    flex-direction: column;
-  }
-  .euiSideNav__content {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
+  .betaSidebarNotification {
+    .euiSideNav {
+      display: flex;
+      flex-direction: column;
+
+      .euiSideNav__content {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
   }
 }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
index 5da455283eceb..202c9b6a59e8d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
@@ -79,6 +79,7 @@ export const EnterpriseSearchPageTemplate: React.FC<PageTemplateProps> = ({
       }}
       isEmptyState={isEmptyState && !isLoading}
       solutionNav={solutionNav ? { icon: 'logoEnterpriseSearch', ...solutionNav } : undefined}
+      pageSideBarProps={{ className: 'betaSidebarNotification' }}
     >
       {setPageChrome}
       {readOnlyMode && (