From 862d9fd1bae1beae65b0230e6d7499122bf7b984 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 17 Sep 2024 19:14:17 +0300
Subject: [PATCH] [Discover] Fix SASS mixed-declations deprecation warnings
 (#193001)

- Closes https://github.com/elastic/kibana/issues/190890
- Closes https://github.com/elastic/kibana/issues/190888
- Closes https://github.com/elastic/kibana/issues/190889
- Closes https://github.com/elastic/kibana/issues/190891

(cherry picked from commit bdac358b5eddb17fba1f2d2f76e777b28db361ff)
---
 packages/kbn-dom-drag-drop/src/sass/draggable.scss   |  3 ++-
 .../custom_toolbar/render_custom_toolbar.scss        |  2 +-
 .../field_list_grouped/field_list_grouped.scss       |  5 +++--
 .../main/components/layout/discover_layout.scss      | 12 ++++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/kbn-dom-drag-drop/src/sass/draggable.scss b/packages/kbn-dom-drag-drop/src/sass/draggable.scss
index c50bdfcb1ba92..80e3b5e5dde91 100644
--- a/packages/kbn-dom-drag-drop/src/sass/draggable.scss
+++ b/packages/kbn-dom-drag-drop/src/sass/draggable.scss
@@ -33,9 +33,10 @@
 
   &:focus,
   &:focus-within {
-    @include euiFocusRing;
     pointer-events: none;
     z-index: $domDragDropZLevel2;
+
+    @include euiFocusRing;
   }
 }
 
diff --git a/packages/kbn-unified-data-table/src/components/custom_toolbar/render_custom_toolbar.scss b/packages/kbn-unified-data-table/src/components/custom_toolbar/render_custom_toolbar.scss
index fc6424e06ab62..0277e03c80e17 100644
--- a/packages/kbn-unified-data-table/src/components/custom_toolbar/render_custom_toolbar.scss
+++ b/packages/kbn-unified-data-table/src/components/custom_toolbar/render_custom_toolbar.scss
@@ -5,6 +5,7 @@
     block-size: $euiSizeXL;
     border: $euiBorderThin;
     border-radius: $euiBorderRadiusSmall;
+    transition: transform $euiAnimSpeedNormal ease-in-out;
 
     // making the icons larger than the default size
     & svg {
@@ -18,7 +19,6 @@
     }
 
     // add toolbar control animation
-    transition: transform $euiAnimSpeedNormal ease-in-out;
     &:hover {
       transform: translateY(-1px);
     }
diff --git a/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.scss b/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.scss
index cd4b9ba2f6e22..2e67146fe2eff 100644
--- a/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.scss
+++ b/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.scss
@@ -3,12 +3,13 @@
  */
 
 .unifiedFieldList__fieldListGrouped {
-  @include euiOverflowShadow;
-  @include euiScrollBar;
   margin-left: -$euiSize; /* 1 */
   position: relative;
   flex-grow: 1;
   overflow: auto;
+
+  @include euiOverflowShadow;
+  @include euiScrollBar;
 }
 
 .unifiedFieldList__fieldListGrouped__container {
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.scss b/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
index bd3ea3698d5f1..cf22e34a0c597 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
@@ -9,6 +9,10 @@ discover-app {
 }
 
 .dscPage {
+  flex-direction: column;
+  overflow: hidden;
+  padding: 0;
+
   @include euiBreakpoint('m', 'l', 'xl') {
     @include kibanaFullBodyHeight();
 
@@ -16,14 +20,10 @@ discover-app {
       @include kibanaFullBodyHeight($euiSize * 3);
     }
   }
+}
 
-  flex-direction: column;
+.dscPage .dscPageBody {
   overflow: hidden;
-  padding: 0;
-
-  .dscPageBody {
-    overflow: hidden;
-  }
 }
 
 .dscPageBody__inner {