From 6a8a653327704450204251fbe814bf3f462ee3be Mon Sep 17 00:00:00 2001 From: "dave.snider@gmail.com" Date: Fri, 5 Oct 2018 00:41:17 -0700 Subject: [PATCH] Management core Less to Sass (#23596) (#23861) Converts management's less to sass. Makes minor adjustments to those pages for some design cleanup. --- src/core_plugins/kibana/public/index.scss | 3 + .../kibana/public/management/_hacks.scss | 46 + .../public/management/_management_app.scss | 55 ++ .../kibana/public/management/index.js | 1 - .../kibana/public/management/index.scss | 14 + .../kibana/public/management/landing.html | 10 +- .../management/sections/indices/index.html | 98 +- .../__snapshots__/relationships.test.js.snap | 136 +-- .../components/relationships/relationships.js | 2 +- .../advanced_settings.test.js.snap | 912 +++++++++--------- .../sections/settings/advanced_settings.js | 60 +- .../sections/settings/advanced_settings.less | 30 - .../sections/settings/advanced_settings.scss | 19 + .../field/__snapshots__/field.test.js.snap | 128 +-- .../settings/components/field/field.js | 6 +- .../kibana/public/management/styles/main.less | 228 ----- src/dev/precommit_hook/casing_check_config.js | 1 - src/ui/public/dragula/gu-dragula.less | 13 - src/ui/public/management/index.js | 5 +- src/ui/public/management/section.js | 2 + x-pack/plugins/index_management/index.js | 1 + .../public/_index_management.scss | 17 + .../index_management/public/index.scss | 13 + .../plugins/index_management/public/main.html | 2 +- .../components/index_list/index_list.js | 2 +- .../components/index_table/index_table.js | 2 +- .../index_management/public/styles/table.less | 8 +- .../__snapshots__/add_license.test.js.snap | 4 +- .../request_trial_extension.test.js.snap | 6 +- .../telemetry_opt_in.test.js.snap | 8 +- x-pack/plugins/license_management/index.js | 1 + .../public/_license_management.scss | 23 + .../plugins/license_management/public/app.js | 4 +- .../telemetry_opt_in/telemetry_opt_in.js | 4 +- .../license_management/public/index.js | 3 +- .../license_management/public/index.scss | 13 + .../license_management/public/main.html | 2 +- .../add_license/add_license.js | 1 - .../license_dashboard/license_dashboard.js | 2 +- .../request_trial_extension.js | 1 - .../start_trial/start_trial.js | 8 +- .../public/styles/main.less | 33 - .../components/pipeline_list/pipeline_list.js | 2 +- .../plugins/ml/public/settings/settings.html | 11 +- .../ml/public/settings/styles/main.less | 4 +- .../public/components/license/index.js | 4 +- .../public/views/license/index.html | 2 +- .../public/views/management/management.js | 3 +- .../json_watch_edit/json_watch_edit.html | 13 +- .../threshold_watch_edit.html | 128 ++- .../watch_edit_title_bar.html | 3 + 51 files changed, 943 insertions(+), 1154 deletions(-) create mode 100644 src/core_plugins/kibana/public/management/_hacks.scss create mode 100644 src/core_plugins/kibana/public/management/_management_app.scss create mode 100644 src/core_plugins/kibana/public/management/index.scss delete mode 100644 src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less create mode 100644 src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss delete mode 100644 src/core_plugins/kibana/public/management/styles/main.less delete mode 100644 src/ui/public/dragula/gu-dragula.less create mode 100644 x-pack/plugins/index_management/public/_index_management.scss create mode 100644 x-pack/plugins/index_management/public/index.scss create mode 100644 x-pack/plugins/license_management/public/_license_management.scss create mode 100644 x-pack/plugins/license_management/public/index.scss delete mode 100644 x-pack/plugins/license_management/public/styles/main.less diff --git a/src/core_plugins/kibana/public/index.scss b/src/core_plugins/kibana/public/index.scss index af7bed50834be..a7b2b0b3ce534 100644 --- a/src/core_plugins/kibana/public/index.scss +++ b/src/core_plugins/kibana/public/index.scss @@ -16,6 +16,9 @@ @import './visualize/index'; @import 'ui/public/vis/index'; +// Management styles +@import './management/index'; + // Dashboard styles // MUST STAY AT THE BOTTOM BECAUSE OF DARK THEME IMPORTS @import './dashboard/index'; diff --git a/src/core_plugins/kibana/public/management/_hacks.scss b/src/core_plugins/kibana/public/management/_hacks.scss new file mode 100644 index 0000000000000..7ee656ca90c64 --- /dev/null +++ b/src/core_plugins/kibana/public/management/_hacks.scss @@ -0,0 +1,46 @@ +// SASSTODO: figure out why this is needed +kbn-management-app, +kbn-management-landing, +kbn-management-indices, +kbn-management-indices-edit, +kbn-management-indices-create, +kbn-management-advanced, +kbn-management-objects, +kbn-management-objects-view { + display: block; +} + +// SASSTODO: Remove when Kibana has a proper background color +.tab-account, .tab-management { + background-color: $euiColorEmptyShade; +} + +// SASSTODO: Remove when Kibana has a proper background color +kbn-management-objects, kbn-management-app { + background: $euiColorLightestShade; + min-height: 100vh; +} + +.kbn-management-tab:first-letter { + text-transform: capitalize; +} + +// SASSTODO: Remove when this is replaced with EuiCode +kbn-management-objects-view { + .ace_editor { height: 300px; } +} + +// SASSTODO: These are some dragula settings. +.gu-handle { + cursor: move; + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; +} + +.gu-mirror, +.gu-mirror .gu-handle { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; +} \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/_management_app.scss b/src/core_plugins/kibana/public/management/_management_app.scss new file mode 100644 index 0000000000000..8fbc3c27dec9d --- /dev/null +++ b/src/core_plugins/kibana/public/management/_management_app.scss @@ -0,0 +1,55 @@ +.mgtPanel { + margin-bottom: $euiSize; + background: $euiColorEmptyShade; +} + +// SASSTODO: Remove when this is replaced by the side nav +.mgtPanel__link { + @include euiFontSizeL; + + line-height: 2; // Give some buffer for when they wrap + + &.mgtPanel__link--disabled { + opacity: $euiColorDarkShade; + cursor: default; + + &:hover, &:visited { + color: $euiColorPrimary; + } + } +} + +// SASSTODO: Remove when this form is replaced by EUI +kbn-management-objects { + form { + margin-bottom: $euiSize; + } + .list-unstyled { + li { + border-bottom: $euiBorderThin; + padding: $euiSizeS; + } + } + .empty { + color: $euiColorDarkShade; + } + + .item { + padding: $euiSizeM; + + .item-title { + margin-left: $euiSizeL; + } + + .actions { + margin-top: $euiSizeXS; + } + } + + .header { + .title, .controls { + padding-right: 1em; + display: inline-block; + } + } +} \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/index.js b/src/core_plugins/kibana/public/management/index.js index e7e99e10cb836..a73a5485653d5 100644 --- a/src/core_plugins/kibana/public/management/index.js +++ b/src/core_plugins/kibana/public/management/index.js @@ -18,7 +18,6 @@ */ import './sections'; -import './styles/main.less'; import 'ui/filters/start_from'; import 'ui/field_editor'; import uiRoutes from 'ui/routes'; diff --git a/src/core_plugins/kibana/public/management/index.scss b/src/core_plugins/kibana/public/management/index.scss new file mode 100644 index 0000000000000..4ae0f0ac7474d --- /dev/null +++ b/src/core_plugins/kibana/public/management/index.scss @@ -0,0 +1,14 @@ +// This file is imported into src/core_plugings/kibana/publix/index.scss + +// Prefix all styles with "dsh" to avoid conflicts. +// Examples +// mgtChart +// mgtChart__legend +// mgtChart__legend--small +// mgtChart__legend-isLoading + +@import 'hacks'; + +// Core +@import 'management_app'; +@import 'sections/settings/advanced_settings'; \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/landing.html b/src/core_plugins/kibana/public/management/landing.html index 60c01123ac97b..7e0d81e7177a4 100644 --- a/src/core_plugins/kibana/public/management/landing.html +++ b/src/core_plugins/kibana/public/management/landing.html @@ -11,12 +11,10 @@ ng-repeat="section in sections" class="page-row" > -
+
-
+

{{::section.display}}

@@ -32,8 +30,8 @@

> -
-
-
- +
+
+
+
+ + + + +
+
+
    +
  • - - - -
-
- + +
+ + +
+ + + +

-
-
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__tests__/__snapshots__/relationships.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__tests__/__snapshots__/relationships.test.js.snap index 9f76af78a1000..961d5480a2e28 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__tests__/__snapshots__/relationships.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__tests__/__snapshots__/relationships.test.js.snap @@ -65,8 +65,8 @@ exports[`Relationships should render dashboards normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -183,131 +183,9 @@ exports[`Relationships should render index patterns normally 1`] = ` - - - - -

- Here are some saved searches that use this index pattern. If - you delete this index pattern, these saved searches will not - longer work properly. -

- - - - - - - -

- Here are some visualizations that use this index pattern. If - you delete this index pattern, these visualizations will not - longer work properly. -

- - - - - + `; @@ -375,8 +253,8 @@ exports[`Relationships should render searches normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -434,8 +312,8 @@ exports[`Relationships should render searches normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -537,8 +415,8 @@ exports[`Relationships should render visualizations normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js index 708a260ebbd43..50b83de790c55 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js @@ -169,7 +169,7 @@ export class Relationships extends Component { items={list} columns={[ { - name: 'Type', + width: 24, render: () => ( - - - - - - + + + + + + + + + + +
- - - - - - - - + -
+ /> + + `; exports[`AdvancedSettings should render specific setting if given setting key 1`] = ` -
- - - - - - + + + + - - - - - - - + + + + + + + - + -
+ /> + + `; diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js index 6ec6cd714556c..ef213a03f4ed7 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js +++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js @@ -25,6 +25,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, + EuiPage, Query, } from '@elastic/eui'; @@ -34,7 +35,6 @@ import { Form } from './components/form'; import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib'; -import './advanced_settings.less'; import { registerDefaultComponents, PAGE_TITLE_COMPONENT, @@ -154,34 +154,36 @@ export class AdvancedSettings extends Component { const PageFooter = getSettingsComponent(PAGE_FOOTER_COMPONENT); return ( -
- - - - - - - - - - - - - - -
+ +
+ + + + + + + + + + + + + + +
+ ); } } diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less deleted file mode 100644 index 5201e5781595a..0000000000000 --- a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less +++ /dev/null @@ -1,30 +0,0 @@ -@import (reference) '~ui/styles/variables/colors'; - -.advancedSettings { - padding: 20px; - background: @globalColorLightestGray; - min-height: calc(~"100vh - 70px"); - - > div { - max-width: 1000px; - margin: 0 auto; - } - - .advancedSettings__field { - + * { - margin-top: 24px; - } - - &__wrapper { - width: 720px; - } - - &__actions { - padding-top: 30px; - } - - .euiFormHelpText { - padding-bottom: 0; - } - } -} diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss new file mode 100644 index 0000000000000..fac9b0e22686c --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss @@ -0,0 +1,19 @@ +.mgtAdvancedSettings { + padding: $euiSizeL; + background: $euiColorLightestShade; + min-height: calc(100vh - 70px); + + .mgtAdvancedSettings__field { + + * { + margin-top: $euiSize; + } + + &Wrapper { + width: 640px; + } + + &Actions { + padding-top: $euiSizeM; + } + } +} diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap index ef827f9ca78d3..111e197674299 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap @@ -3,7 +3,7 @@ exports[`Field for array setting should render as read only with help text if overridden 1`] = `
+ + tr > td { - vertical-align: middle; - } - } - - .advancedSettingsTableRowImage { - height: 3em; - width: auto; - } - - .advancedSettingsTableRowActionsCell { - max-width: 300px; - } -} - -kbn-management-objects-view { - .ace_editor { height: 300px; } -} - -.advanced-settings { - overflow-x: scroll; - - table { - width: 100%; - - tr.default td.value { - color: @management-advanced-table-default-color; - } - - td { - font-family: @font-family-monospace; - - &.actions { - width: 150px; - } - } - } -} - -.indices-settings { - i.active { - color: @management-indices-active-color; - } - - tr.field-settings { - .field-popularize { - margin-left: 5px; - display: none; - } - &:hover .field-popularize { - display: inline; - } - } -} - -kbn-management-indices { - .fields { - display: block; - table { - .table-striped() - } - - th:last-child, - td:last-child { - text-align: right; - } - } - - .indexed-fields { - th:first-child, - td:first-child { - width: 35%; - } - } - - .scripted-fields header { - margin: 5px 0; - text-align: right; - } - - p.text-center { - padding-top: 1em; - } -} - -@import "~ui/dragula/gu-dragula.less"; diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index dbe953f5513a2..d08e4e2638d7b 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -161,7 +161,6 @@ export const TEMPORARILY_IGNORED_PATHS = [ 'src/ui/public/assets/favicons/mstile-150x150.png', 'src/ui/public/assets/favicons/safari-pinned-tab.svg', 'src/ui/public/directives/__tests__/confirm-click.js', - 'src/ui/public/dragula/gu-dragula.less', 'src/ui/public/field_format_editor/editors/url/icons/flag-icon.LICENSE', 'src/ui/public/icons/beats-color.svg', 'src/ui/public/icons/beats-gray.svg', diff --git a/src/ui/public/dragula/gu-dragula.less b/src/ui/public/dragula/gu-dragula.less deleted file mode 100644 index c51c873601806..0000000000000 --- a/src/ui/public/dragula/gu-dragula.less +++ /dev/null @@ -1,13 +0,0 @@ -.gu-handle { - cursor: move; - cursor: grab; - cursor: -moz-grab; - cursor: -webkit-grab; -} - -.gu-mirror, -.gu-mirror .gu-handle { - cursor: grabbing; - cursor: -moz-grabbing; - cursor: -webkit-grabbing; -} diff --git a/src/ui/public/management/index.js b/src/ui/public/management/index.js index b4a0262bf8882..dfbea11df606a 100644 --- a/src/ui/public/management/index.js +++ b/src/ui/public/management/index.js @@ -41,15 +41,18 @@ management.register('data', { management.register('elasticsearch', { display: 'Elasticsearch', - order: 20 + order: 20, + icon: 'logoElasticsearch' }); management.register('kibana', { display: 'Kibana', order: 30, + icon: 'logoKibana', }); management.register('logstash', { display: 'Logstash', order: 30, + icon: 'logoLogstash', }); diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js index cd99d3c877272..cafb8bc81ea37 100644 --- a/src/ui/public/management/section.js +++ b/src/ui/public/management/section.js @@ -31,6 +31,7 @@ export class ManagementSection { * @param {boolean|null} options.visible - defaults to true * @param {boolean|null} options.disabled - defaults to false * @param {string|null} options.tooltip - defaults to '' + * @param {string|null} options.icon - defaults to '' * @returns {ManagementSection} */ @@ -44,6 +45,7 @@ export class ManagementSection { this.visible = true; this.disabled = false; this.tooltip = ''; + this.icon = ''; this.url = ''; assign(this, options); diff --git a/x-pack/plugins/index_management/index.js b/x-pack/plugins/index_management/index.js index c3d3e8fe1caf5..4408428364b83 100644 --- a/x-pack/plugins/index_management/index.js +++ b/x-pack/plugins/index_management/index.js @@ -18,6 +18,7 @@ export function indexManagement(kibana) { publicDir: resolve(__dirname, 'public'), require: ['kibana', 'elasticsearch', 'xpack_main'], uiExports: { + styleSheetPaths: `${__dirname}/public/index.scss`, managementSections: [ 'plugins/index_management', ] diff --git a/x-pack/plugins/index_management/public/_index_management.scss b/x-pack/plugins/index_management/public/_index_management.scss new file mode 100644 index 0000000000000..4012126e64e5a --- /dev/null +++ b/x-pack/plugins/index_management/public/_index_management.scss @@ -0,0 +1,17 @@ +#indReactRoot { + background-color: $euiColorLightestShade; +} + +.indTable__link { + text-align: left; +} + +.indTable__horizontalScrollContainer { + overflow-x: auto; + max-width: 100%; + height: 100vh; +} +.indTable__horizontalScroll { + min-width: 800px; + width: 100%; +} \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/index.scss b/x-pack/plugins/index_management/public/index.scss new file mode 100644 index 0000000000000..e5fcf114bcc08 --- /dev/null +++ b/x-pack/plugins/index_management/public/index.scss @@ -0,0 +1,13 @@ +// Import the EUI global scope so we can use EUI constants +@import 'ui/public/styles/_styling_constants'; + +// Index management plugin styles + +// Prefix all styles with "ind" to avoid conflicts. +// Examples +// indChart +// indChart__legend +// indChart__legend--small +// indChart__legend-isLoading + +@import 'index_management'; \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/main.html b/x-pack/plugins/index_management/public/main.html index a32b3e94ec0dd..6c13c980e8371 100644 --- a/x-pack/plugins/index_management/public/main.html +++ b/x-pack/plugins/index_management/public/main.html @@ -1,3 +1,3 @@ -
+
diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js index 8ebae49b11238..19e8b4f071cbf 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js @@ -29,7 +29,7 @@ export class IndexList extends React.PureComponent { render() { return ( -
+
diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js index 49ba4ef3bedb2..20dde2cbe7562 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js @@ -168,7 +168,7 @@ export class IndexTableUi extends Component { } else if (fieldName === 'name') { return ( { openDetailPanel(value); diff --git a/x-pack/plugins/index_management/public/styles/table.less b/x-pack/plugins/index_management/public/styles/table.less index a93fe289f9b63..6ac08e744951d 100644 --- a/x-pack/plugins/index_management/public/styles/table.less +++ b/x-pack/plugins/index_management/public/styles/table.less @@ -2,23 +2,23 @@ background-color: #F5F5F5; } -.indexTable__link { +.indTable__link { text-align: left; } .indexTable__header--name { width: 25%; } -.indexTableHorizontalScrollContainer { +.indTable__horizontalScrollContainer { overflow-x: auto; max-width: 100%; height: 100vh; } -.indexTableHorizontalScroll { +.indTable__horizontalScroll { min-width: 800px; width: 100%; } -.indexDetail__codeBlock { +.indDetail__codeBlock { background: transparent; } diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap index 911966fa9ebbc..c6aeef84094b0 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`AddLicense component when license is active should display correct verbiage 1`] = `"
Update your license

If you already have a new license, upload it now.

Update license
"`; +exports[`AddLicense component when license is active should display correct verbiage 1`] = `"
Update your license

If you already have a new license, upload it now.

Update license
"`; -exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"
Update your license

If you already have a new license, upload it now.

Update license
"`; +exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"
Update your license

If you already have a new license, upload it now.

Update license
"`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap index 15e3d623baf11..c27bfcd83014c 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; +exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; -exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; +exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; -exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; +exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"
Extend your trial

If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

Extend trial
"`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap index 59d12b9414dea..dbe419fcc5bd9 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap @@ -40,7 +40,7 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` Read more } - className="licenseManagement__baseline" + className="eui-AlignBaseline" closePopover={[Function]} hasArrow={true} id="readMorePopover" @@ -49,7 +49,7 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` panelPaddingSize="m" >

@@ -111,7 +111,7 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` Read more } - className="licenseManagement__baseline" + className="eui-AlignBaseline" closePopover={[Function]} hasArrow={true} id="readMorePopover" @@ -123,7 +123,7 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` onOutsideClick={[Function]} >

( - - + + diff --git a/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js b/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js index 1aff356e50f6b..f16700139087c 100644 --- a/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js +++ b/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js @@ -80,9 +80,9 @@ export class TelemetryOptIn extends React.Component { button={readMoreButton} isOpen={showMoreTelemetryInfo} closePopover={this.closeReadMorePopover} - className="licenseManagement__baseline" + className="eui-AlignBaseline" > - +

This feature periodically sends basic feature usage statistics. This information will not be shared outside of Elastic. diff --git a/x-pack/plugins/license_management/public/index.js b/x-pack/plugins/license_management/public/index.js index a22685c48136a..79d4f1c431cb5 100644 --- a/x-pack/plugins/license_management/public/index.js +++ b/x-pack/plugins/license_management/public/index.js @@ -5,5 +5,4 @@ */ import './management_section'; -import './register_route'; -import './styles/main.less'; +import './register_route'; \ No newline at end of file diff --git a/x-pack/plugins/license_management/public/index.scss b/x-pack/plugins/license_management/public/index.scss new file mode 100644 index 0000000000000..268372a9498d4 --- /dev/null +++ b/x-pack/plugins/license_management/public/index.scss @@ -0,0 +1,13 @@ +// EUI globals +@import 'ui/public/styles/styling_constants'; + +// License amnagement plugin styles + +// Prefix all styles with "lic" to avoid conflicts. +// Examples +// licChart +// licChart__legend +// licChart__legend--small +// licChart__legend-isLoading + +@import 'license_management'; \ No newline at end of file diff --git a/x-pack/plugins/license_management/public/main.html b/x-pack/plugins/license_management/public/main.html index dd2e2aab37798..310eda8be763a 100644 --- a/x-pack/plugins/license_management/public/main.html +++ b/x-pack/plugins/license_management/public/main.html @@ -1,3 +1,3 @@ -

+
diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js b/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js index bd519433a2545..ec45591e23d49 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js @@ -17,7 +17,6 @@ export const AddLicense = ({ uploadPath = `#${BASE_PATH}upload_license` }) => { footer={ Update license diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js b/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js index 2ae0863e96bd3..f5a61613e5bf8 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js @@ -20,7 +20,7 @@ import { export const LicenseDashboard = () => { return ( -
+
diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js b/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js index 263023ce2a545..77e8700e5fe81 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js @@ -32,7 +32,6 @@ export const RequestTrialExtension = ({ shouldShowRequestTrialExtension }) => { footer={ diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js index a5ff9f6c8a9e2..d62c3ea384a38 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js @@ -56,7 +56,7 @@ export class StartTrial extends React.PureComponent { return ( @@ -114,9 +114,9 @@ export class StartTrial extends React.PureComponent { {this.telemetryOptIn = ref; }}/> - + - + - + + {this.renderNoPermissionCallOut()} -
+
-
Job Management
-
+