[Discover] Fix SASS mixed-declations deprecation warnings (elastic#19…

…3001) - Closes elastic#190890 - Closes elastic#190888 - Closes elastic#190889 - Closes elastic#190891
markov00 · Sep 18, 2024 · d52c1e4 · d52c1e4
1 parent 0d1d80a
commit d52c1e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -9,21 +9,21 @@ discover-app {
 }
 
 .dscPage {
+  flex-direction: column;
+  overflow: hidden;
+  padding: 0;
+
   @include euiBreakpoint('m', 'l', 'xl') {
     @include kibanaFullBodyHeight();
 
     &.dscPage--topNavInline {
       @include kibanaFullBodyHeight($euiSize * 3);
     }
   }
+}
 
-  flex-direction: column;
+.dscPage .dscPageBody {
   overflow: hidden;
-  padding: 0;
-
-  .dscPageBody {
-    overflow: hidden;
-  }
 }
 
 .dscPageBody__inner {