Fix other conflicts

elastic · Sep 10, 2020 · 8c61729 · 8c61729
1 parent 90e1dda
commit 8c61729
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 12 deletions.
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/_index.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/_index.scss
diff --git a/...tor_frame/config_panel/_config_panel.scss → ...itor_frame/config_panel/config_panel.scss b/...tor_frame/config_panel/_config_panel.scss → ...itor_frame/config_panel/config_panel.scss
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import './config_panel.scss';
 
 import React, { useMemo, memo } from 'react';
 import { EuiFlexItem, EuiToolTip, EuiButton, EuiForm } from '@elastic/eui';

diff --git a/...me/config_panel/_dimension_container.scss → ...ame/config_panel/dimension_container.scss b/...me/config_panel/_dimension_container.scss → ...ame/config_panel/dimension_container.scss
@@ -27,10 +27,3 @@
   display: block;
   word-break: break-word;
 }
-
-// todo: remove after closing https://github.com/elastic/eui/issues/3548
-.lnsDimensionPopover__fixTranslateDnd {
-  // sass-lint:disable-block no-important
-  transform: none !important;
-}
-
diff --git a/...lugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx b/...lugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import './dimension_popover.scss';
+import './dimension_container.scss';
 
 import React, { useState, useEffect } from 'react';
 import {

diff --git a/...itor_frame/config_panel/_layer_panel.scss → ...ditor_frame/config_panel/layer_panel.scss b/...itor_frame/config_panel/_layer_panel.scss → ...ditor_frame/config_panel/layer_panel.scss
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import './layer_panel.scss';
 
 import React, { useContext, useState, useEffect } from 'react';
 import {

diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/index.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/index.scss
@@ -1,4 +1,3 @@
-@import 'config_panel/index';
 @import 'data_panel_wrapper';
 @import 'expression_renderer';
 @import 'frame_layout';