Fix styles loading order (#83299) (#83513)

Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Kibana Machine <[email protected]>
elastic · Nov 17, 2020 · 03f9837 · 03f9837
1 parent c1b42f6
commit 03f9837
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/plugins/timelion/public/index.scss b/src/plugins/timelion/public/index.scss
@@ -15,4 +15,4 @@
 // styles for timelion visualization are lazy loaded only while a vis is opened
 // this will duplicate styles only if both Timelion app and timelion visualization are loaded
 // could be left here as it is since the Timelion app is deprecated
-@import '../../vis_type_timelion/public/components/index.scss';
+@import '../../vis_type_timelion/public/components/timelion_vis.scss';
diff --git a/src/plugins/vis_type_timelion/public/components/index.scss b/src/plugins/vis_type_timelion/public/components/index.scss
diff --git a/...lion/public/components/_timelion_vis.scss → ...elion/public/components/timelion_vis.scss b/...lion/public/components/_timelion_vis.scss → ...elion/public/components/timelion_vis.scss
@@ -58,11 +58,3 @@
   white-space: nowrap;
   font-weight: $euiFontWeightBold;
 }
-
-.visEditor--timelion {
-  .visEditorSidebar__timelionOptions {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-  }
-}
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_vis_component.tsx b/src/plugins/vis_type_timelion/public/components/timelion_vis_component.tsx
@@ -40,7 +40,7 @@ import { tickFormatters } from '../helpers/tick_formatters';
 import { generateTicksProvider } from '../helpers/tick_generator';
 import { TimelionVisDependencies } from '../plugin';
 
-import './index.scss';
+import './timelion_vis.scss';
 
 interface CrosshairPlot extends jquery.flot.plot {
   setCrosshair: (pos: Position) => void;

diff --git a/...omponents/_timelion_expression_input.scss → ...ype_timelion/public/timelion_options.scss b/...omponents/_timelion_expression_input.scss → ...ype_timelion/public/timelion_options.scss
@@ -26,3 +26,11 @@
     max-height: $euiSize * 15;
   }
 }
+
+.visEditor--timelion {
+  .visEditorSidebar__timelionOptions {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+  }
+}
diff --git a/src/plugins/vis_type_timelion/public/timelion_options.tsx b/src/plugins/vis_type_timelion/public/timelion_options.tsx
@@ -27,6 +27,8 @@ import { TimelionVisParams } from './timelion_vis_fn';
 import { TimelionInterval, TimelionExpressionInput } from './components';
 import { TimelionVisDependencies } from './plugin';
 
+import './timelion_options.scss';
+
 export type TimelionOptionsProps = VisOptionsProps<TimelionVisParams>;
 
 function TimelionOptions({