Sass import paths from root rather than src

elastic · Feb 8, 2019 · 012b2be · 012b2be
1 parent 01844be
commit 012b2be
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 28 deletions.
diff --git a/src/legacy/core_plugins/console/public/index.scss b/src/legacy/core_plugins/console/public/index.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // Prefix all styles with "con" to avoid conflicts.
 // Examples

diff --git a/src/legacy/core_plugins/inspector_views/public/index.scss b/src/legacy/core_plugins/inspector_views/public/index.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // Prefix all styles with "ins" to avoid conflicts.
 // Examples

diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
@@ -1,7 +1,7 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // Public UI styles
-@import 'ui/public/index';
+@import 'src/legacy/ui/public/index';
 
 // Context styles
 @import './context/index';
@@ -19,7 +19,7 @@
 @import './visualize/index';
 // Has to come after visualize because of some
 // bad cascading in the Editor layout
-@import 'ui/public/vis/index';
+@import 'src/legacy/ui/public/vis/index';
 
 // Management styles
 @import './management/index';

diff --git a/src/legacy/core_plugins/status_page/public/index.scss b/src/legacy/core_plugins/status_page/public/index.scss
@@ -1 +1 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
diff --git a/src/legacy/core_plugins/timelion/public/index.scss b/src/legacy/core_plugins/timelion/public/index.scss
@@ -1,5 +1,5 @@
 // Should import both the EUI constants and any Kibana ones that are considered global
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 /* Timelion plugin styles */
 

diff --git a/src/legacy/server/sass/__fixtures__/index.scss b/src/legacy/server/sass/__fixtures__/index.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 foo {
   bar {

diff --git a/src/legacy/server/sass/build.js b/src/legacy/server/sass/build.js
@@ -91,7 +91,6 @@ export class Build {
       sourceMap: true,
       sourceMapEmbed: true,
       includePaths: [
-        resolve(__dirname, '../../..'),
         resolve(__dirname, '../../../../node_modules'),
       ],
       importer: this.theme === 'dark' ? DARK_THEME_IMPORTER : undefined

diff --git a/x-pack/plugins/apm/public/index.scss b/x-pack/plugins/apm/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 /* APM plugin styles */
 

diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // Canvas core
 @import 'hackery';

diff --git a/x-pack/plugins/cross_cluster_replication/public/index.scss b/x-pack/plugins/cross_cluster_replication/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Cross Cluster Replication plugin styles
 

diff --git a/x-pack/plugins/graph/public/index.scss b/x-pack/plugins/graph/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 /* Graph plugin styles */
 

diff --git a/x-pack/plugins/graph/public/templates/_graph.scss b/x-pack/plugins/graph/public/templates/_graph.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/chrome/variables';
+@import 'src/legacy/ui/public/chrome/variables';
 
 @mixin gphSvgText() {
   font-family: $euiFontFamily;

diff --git a/x-pack/plugins/index_lifecycle_management/public/index.scss b/x-pack/plugins/index_lifecycle_management/public/index.scss
@@ -1,3 +1,3 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 @import 'index_lifecycle_management';
diff --git a/x-pack/plugins/index_management/public/index.scss b/x-pack/plugins/index_management/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Index management plugin styles
 

diff --git a/x-pack/plugins/infra/public/index.scss b/x-pack/plugins/infra/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 /* Infra plugin styles */
 

diff --git a/x-pack/plugins/license_management/public/index.scss b/x-pack/plugins/license_management/public/index.scss
@@ -1,5 +1,5 @@
 // EUI globals
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // License amnagement plugin styles
 

diff --git a/x-pack/plugins/maps/public/index.scss b/x-pack/plugins/maps/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 /* GIS plugin styles */
 

diff --git a/x-pack/plugins/ml/public/index.scss b/x-pack/plugins/ml/public/index.scss
@@ -1,5 +1,5 @@
 // Should import both the EUI constants and any Kibana ones that are considered global
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // ML needs EUI card styling till it fully adopts React components
 @import '@elastic/eui/src/components/panel/variables';

diff --git a/x-pack/plugins/monitoring/public/index.scss b/x-pack/plugins/monitoring/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Temporary hacks
 @import 'hacks';

diff --git a/x-pack/plugins/remote_clusters/public/index.scss b/x-pack/plugins/remote_clusters/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 @import './sections/remote_cluster_list/components/connection_status/index';
 
 // Index management plugin styles

diff --git a/x-pack/plugins/rollup/public/index.scss b/x-pack/plugins/rollup/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Index management plugin styles
 

diff --git a/x-pack/plugins/searchprofiler/public/index.scss b/x-pack/plugins/searchprofiler/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Search profiler plugin styles
 

diff --git a/x-pack/plugins/security/public/index.scss b/x-pack/plugins/security/public/index.scss
@@ -1,4 +1,4 @@
-@import 'ui/public/styles/styling_constants';
+@import 'src/legacy/ui/public/styles/styling_constants';
 
 // Logged out styles
 @import './views/logged_out/index';

diff --git a/x-pack/plugins/spaces/public/index.scss b/x-pack/plugins/spaces/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 /* Spaces plugin styles */
 

diff --git a/x-pack/plugins/upgrade_assistant/public/index.scss b/x-pack/plugins/upgrade_assistant/public/index.scss
@@ -1,3 +1,3 @@
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 @import './components/index';
diff --git a/x-pack/plugins/watcher/public/index.scss b/x-pack/plugins/watcher/public/index.scss
@@ -1,5 +1,5 @@
 // Import the EUI global scope so we can use EUI constants
-@import 'ui/public/styles/_styling_constants';
+@import 'src/legacy/ui/public/styles/_styling_constants';
 
 // Temporary hacks
 @import 'hacks';