From 01fc7869dc701ad4209bdae9108b639408e4930c Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 19 Sep 2018 13:25:47 -0700 Subject: [PATCH] Sandbox plugin styles Signed-off-by: Tyler Smalley --- .../status_page/public/index.scss | 2 +- src/ui/public/chrome/directives/kbn_chrome.js | 2 + x-pack/plugins/canvas/public/style/index.scss | 96 ++++++++++--------- x-pack/plugins/dashboard_mode/index.js | 1 - .../plugins/dashboard_mode/public/index.scss | 3 - x-pack/plugins/ml/index.js | 1 - x-pack/plugins/ml/public/index.scss | 3 - x-pack/plugins/monitoring/public/index.scss | 36 +++---- 8 files changed, 71 insertions(+), 73 deletions(-) delete mode 100644 x-pack/plugins/dashboard_mode/public/index.scss delete mode 100644 x-pack/plugins/ml/public/index.scss diff --git a/src/core_plugins/status_page/public/index.scss b/src/core_plugins/status_page/public/index.scss index 8bab6ef41e15..85c5bf15f316 100644 --- a/src/core_plugins/status_page/public/index.scss +++ b/src/core_plugins/status_page/public/index.scss @@ -1,6 +1,6 @@ @import 'ui/public/styles/styling_constants'; // SASSTODO: Remove when K7 applies background color to body -.stsPage { +#status_page-app .stsPage { min-height: 100vh; } \ No newline at end of file diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js index 31bdf62646a7..c1af7268f767 100644 --- a/src/ui/public/chrome/directives/kbn_chrome.js +++ b/src/ui/public/chrome/directives/kbn_chrome.js @@ -44,6 +44,8 @@ export function kbnChromeProvider(chrome, internals) { const $content = $(require('./kbn_chrome.html')); const $app = $content.find('.application'); + $app.attr('id', `${internals.app.id}-app`); + if (internals.rootController) { $app.attr('ng-controller', internals.rootController); } diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss index 8b586dbed205..0421acb4da08 100644 --- a/x-pack/plugins/canvas/public/style/index.scss +++ b/x-pack/plugins/canvas/public/style/index.scss @@ -5,52 +5,54 @@ @import '@elastic/eui/src/global_styling/variables/index'; @import '@elastic/eui/src/global_styling/mixins/index'; -// Canvas core -@import 'hackery'; -@import 'main'; +#canvas-app { + // Canvas core + @import 'hackery'; + @import 'main'; -// Canvas apps -@import '../apps/home/home_app'; -@import '../apps/workpad/workpad_app/workpad_app'; -@import '../apps/export/export/export_app'; + // Canvas apps + @import '../apps/home/home_app'; + @import '../apps/workpad/workpad_app/workpad_app'; + @import '../apps/export/export/export_app'; -// Canvas components -@import '../components/alignment_guide/alignment_guide'; -@import '../components/arg_add/arg_add'; -@import '../components/arg_add_popover/arg_add_popover'; -@import '../components/arg_form/arg_form'; -@import '../components/asset_manager/asset_manager'; -@import '../components/border_connection/border_connection'; -@import '../components/border_resize_handle/border_resize_handle'; -@import '../components/color_dot/color_dot'; -@import '../components/color_palette/color_palette'; -@import '../components/color_picker_mini/color_picker_mini'; -@import '../components/context_menu/context_menu'; -@import '../components/datasource/datasource'; -@import '../components/datasource/datasource_preview/datasource_preview'; -@import '../components/datatable/datatable'; -@import '../components/debug/debug'; -@import '../components/dom_preview/dom_preview'; -@import '../components/element_content/element_content'; -@import '../components/expression_input/suggestion'; -@import '../components/font_picker/font_picker'; -@import '../components/fullscreen/fullscreen'; -@import '../components/function_form/function_form'; -@import '../components/hover_annotation/hover_annotation'; -@import '../components/loading/loading'; -@import '../components/navbar/navbar'; -@import '../components/page_manager/page_manager'; -@import '../components/palette_picker/palette_picker'; -@import '../components/palette_swatch/palette_swatch'; -@import '../components/positionable/positionable'; -@import '../components/refresh_control/refresh_control'; -@import '../components/remove_icon/remove_icon'; -@import '../components/rotation_handle/rotation_handle'; -@import '../components/shape_preview/shape_preview'; -@import '../components/shape_picker_mini/shape_picker_mini'; -@import '../components/sidebar/sidebar'; -@import '../components/toolbar/toolbar'; -@import '../components/toolbar/tray/tray'; -@import '../components/workpad/workpad'; -@import '../components/workpad_loader/workpad_dropzone/workpad_dropzone'; -@import '../components/workpad_page/workpad_page'; \ No newline at end of file + // Canvas components + @import '../components/alignment_guide/alignment_guide'; + @import '../components/arg_add/arg_add'; + @import '../components/arg_add_popover/arg_add_popover'; + @import '../components/arg_form/arg_form'; + @import '../components/asset_manager/asset_manager'; + @import '../components/border_connection/border_connection'; + @import '../components/border_resize_handle/border_resize_handle'; + @import '../components/color_dot/color_dot'; + @import '../components/color_palette/color_palette'; + @import '../components/color_picker_mini/color_picker_mini'; + @import '../components/context_menu/context_menu'; + @import '../components/datasource/datasource'; + @import '../components/datasource/datasource_preview/datasource_preview'; + @import '../components/datatable/datatable'; + @import '../components/debug/debug'; + @import '../components/dom_preview/dom_preview'; + @import '../components/element_content/element_content'; + @import '../components/expression_input/suggestion'; + @import '../components/font_picker/font_picker'; + @import '../components/fullscreen/fullscreen'; + @import '../components/function_form/function_form'; + @import '../components/hover_annotation/hover_annotation'; + @import '../components/loading/loading'; + @import '../components/navbar/navbar'; + @import '../components/page_manager/page_manager'; + @import '../components/palette_picker/palette_picker'; + @import '../components/palette_swatch/palette_swatch'; + @import '../components/positionable/positionable'; + @import '../components/refresh_control/refresh_control'; + @import '../components/remove_icon/remove_icon'; + @import '../components/rotation_handle/rotation_handle'; + @import '../components/shape_preview/shape_preview'; + @import '../components/shape_picker_mini/shape_picker_mini'; + @import '../components/sidebar/sidebar'; + @import '../components/toolbar/toolbar'; + @import '../components/toolbar/tray/tray'; + @import '../components/workpad/workpad'; + @import '../components/workpad_loader/workpad_dropzone/workpad_dropzone'; + @import '../components/workpad_page/workpad_page'; +} \ No newline at end of file diff --git a/x-pack/plugins/dashboard_mode/index.js b/x-pack/plugins/dashboard_mode/index.js index df86e57ed371..514e45de1d10 100644 --- a/x-pack/plugins/dashboard_mode/index.js +++ b/x-pack/plugins/dashboard_mode/index.js @@ -52,7 +52,6 @@ export function dashboardMode(kibana) { } ], }, - styleSheetPaths: `${__dirname}/public/index.scss`, }, config(Joi) { diff --git a/x-pack/plugins/dashboard_mode/public/index.scss b/x-pack/plugins/dashboard_mode/public/index.scss deleted file mode 100644 index 940cb113b679..000000000000 --- a/x-pack/plugins/dashboard_mode/public/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import 'ui/public/styles/styling_constants'; - -@import 'core_plugins/kibana/public/dashboard/index'; diff --git a/x-pack/plugins/ml/index.js b/x-pack/plugins/ml/index.js index 4018bf755234..ce511ad3f7d8 100644 --- a/x-pack/plugins/ml/index.js +++ b/x-pack/plugins/ml/index.js @@ -39,7 +39,6 @@ export const ml = (kibana) => { icon: 'plugins/ml/ml.svg', main: 'plugins/ml/app', }, - styleSheetPaths: `${__dirname}/public/index.scss`, hacks: ['plugins/ml/hacks/toggle_app_link_in_nav'], home: ['plugins/ml/register_feature'] }, diff --git a/x-pack/plugins/ml/public/index.scss b/x-pack/plugins/ml/public/index.scss deleted file mode 100644 index daaeb91856f7..000000000000 --- a/x-pack/plugins/ml/public/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import 'ui/public/styles/styling_constants'; - -@import 'core_plugins/kibana/public/visualize/index'; diff --git a/x-pack/plugins/monitoring/public/index.scss b/x-pack/plugins/monitoring/public/index.scss index 67974b71cd72..bd4a55b9ac13 100644 --- a/x-pack/plugins/monitoring/public/index.scss +++ b/x-pack/plugins/monitoring/public/index.scss @@ -1,23 +1,25 @@ // Import the EUI global scope so we can use EUI constants @import 'ui/public/styles/_styling_constants'; -// Temporary hacks -@import 'hacks'; +#monitoring-app { + // Temporary hacks + @import 'hacks'; -// Monitoring plugin styles + // Monitoring plugin styles -// Prefix all styles with "mon" to avoid conflicts. -// Examples -// monChart -// monChart__legend -// monChart__legend--small -// monChart__legend-isLoading + // Prefix all styles with "mon" to avoid conflicts. + // Examples + // monChart + // monChart__legend + // monChart__legend--small + // monChart__legend-isLoading -@import 'components/chart/index'; -@import 'components/no_data/index'; -@import 'components/sparkline/index'; -@import 'components/summary_status/index'; -@import 'components/table/index'; -@import 'components/logstash/pipeline_viewer/views/index'; -@import 'directives/chart/index'; -@import 'directives/elasticsearch/shard_allocation/index'; + @import 'components/chart/index'; + @import 'components/no_data/index'; + @import 'components/sparkline/index'; + @import 'components/summary_status/index'; + @import 'components/table/index'; + @import 'components/logstash/pipeline_viewer/views/index'; + @import 'directives/chart/index'; + @import 'directives/elasticsearch/shard_allocation/index'; +} \ No newline at end of file