Skip to content

Commit

Permalink
Merge pull request #2 from flash1293/np/vis_type_vislib-styles
Browse files Browse the repository at this point in the history
move test styles to tests_bundle
  • Loading branch information
sulemanof authored Apr 24, 2020
2 parents ebbb1be + 9c0f47e commit eefb960
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/legacy/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,9 @@
// Public UI styles
@import 'src/legacy/ui/public/index';

// vis_type_vislib UI styles are imported here for running karma Browser tests
// should be somehow included through the "vis_type_vislib" plugin initialization
@import '../../../../plugins/vis_type_vislib/public/index';

// Discover styles
@import 'discover/index';

// Visualization styles are imported here for running karma Browser tests
// should be somehow included through the "visualizations" plugin initialization
@import '../../../../plugins/visualizations/public/index';

// Has to come after visualize because of some
// bad cascading in the Editor layout
@import '../../../../plugins/maps_legacy/public/index';
Expand Down
2 changes: 2 additions & 0 deletions src/legacy/core_plugins/tests_bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

import { createReadStream } from 'fs';
import { resolve } from 'path';

import globby from 'globby';
import MultiStream from 'multistream';
Expand All @@ -40,6 +41,7 @@ export default kibana => {
},

uiExports: {
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
async __bundleProvider__(kbnServer) {
const modules = new Set();

Expand Down
9 changes: 9 additions & 0 deletions src/legacy/core_plugins/tests_bundle/public/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import 'src/legacy/ui/public/styles/styling_constants';

// vis_type_vislib UI styles are imported here for running karma Browser tests
// should be somehow included through the "vis_type_vislib" plugin initialization
@import '../../../../plugins/vis_type_vislib/public/index';

// Visualization styles are imported here for running karma Browser tests
// should be somehow included through the "visualizations" plugin initialization
@import '../../../../plugins/visualizations/public/index';

0 comments on commit eefb960

Please sign in to comment.