diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index be10eb58f7e5..cf6ae03d5033 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -42,6 +42,7 @@ export const IGNORE_FILE_GLOBS = [ '**/{webpackShims,__mocks__}/**/*', 'x-pack/docs/**/*', 'src/dev/tslint/rules/*', + 'src/ui/public/assets/fonts/**/*', // filename must match language code which requires capital letters '**/translations/*.json', diff --git a/src/legacy/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss b/src/legacy/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss index 101ce11f4561..a1606566d22e 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss +++ b/src/legacy/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss @@ -78,7 +78,7 @@ } .dshPanel__title { - font-size: inherit; + font-size: $euiFontSizeS; color: $euiColorDarkShade; transition: color $euiAnimSpeedFast $euiAnimSlightResistance; flex: 1 1 auto; diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap index 2bf07e971205..623b115ec388 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap @@ -33,7 +33,7 @@ exports[`apmUiEnabled 1`] = `

@@ -66,7 +66,7 @@ exports[`home directories should not render directory entry when showOnHomePage paddingSize="l" >

@@ -101,12 +101,14 @@ exports[`home directories should not render directory entry when showOnHomePage wrap={false} >

@@ -204,7 +206,7 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel paddingSize="l" >

@@ -258,12 +260,14 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel wrap={false} >

@@ -380,7 +384,7 @@ exports[`home directories should render DATA directory entry in "Explore Data" p paddingSize="l" >

@@ -415,12 +419,14 @@ exports[`home directories should render DATA directory entry in "Explore Data" p wrap={false} >

@@ -518,7 +524,7 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = ` paddingSize="l" >

@@ -553,12 +559,14 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = ` wrap={false} >

@@ -656,7 +664,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t paddingSize="l" >

@@ -691,12 +699,14 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t wrap={false} >

@@ -794,7 +804,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th paddingSize="l" >

@@ -829,150 +839,14 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th wrap={false} > -

- -

- - - - - - - - - -`; - -exports[`home should not contain RecentlyAccessed panel when there is no recentlyAccessed history 1`] = ` - - - - - - - - -

- -

- - - - - - - - -

- -

- - - - - - - - - -

- -

@@ -1084,7 +944,7 @@ exports[`home should render home component 1`] = ` paddingSize="l" >

@@ -1119,12 +979,14 @@ exports[`home should render home component 1`] = ` wrap={false} >

@@ -1222,7 +1084,7 @@ exports[`home welcome should show the normal home page if loading fails 1`] = ` paddingSize="l" >

@@ -1257,12 +1119,14 @@ exports[`home welcome should show the normal home page if loading fails 1`] = ` wrap={false} >

@@ -1360,7 +1224,7 @@ exports[`home welcome should show the normal home page if welcome screen is disa paddingSize="l" >

@@ -1395,12 +1259,14 @@ exports[`home welcome should show the normal home page if welcome screen is disa wrap={false} >

@@ -1505,7 +1371,7 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = ` paddingSize="l" >

@@ -1540,12 +1406,14 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = ` wrap={false} >

@@ -42,7 +42,7 @@ exports[`props iconType 1`] = `

@@ -100,7 +100,7 @@ exports[`props iconUrl 1`] = `

@@ -148,7 +148,7 @@ exports[`props isBeta 1`] = `

@@ -196,7 +196,7 @@ exports[`render 1`] = `

{ />

- +

{ - + { {mlEnabled !== false ? - + { : null } - + 0) { - recentlyAccessedPanel = ( - - - - - ); - } + const { apmUiEnabled, mlEnabled } = this.props; return ( - {recentlyAccessedPanel} - +

- +

- - + +

{ beforeEach(() => { defaultProps = { - recentlyAccessed: [], directories: [], apmUiEnabled: true, mlEnabled: true, @@ -80,23 +79,7 @@ describe('home', () => { } test('should render home component', async () => { - const component = await renderHome({ - recentlyAccessed: [ - { - label: 'my vis', - link: 'link_to_my_vis', - id: '1' - } - ], - }); - - expect(component).toMatchSnapshot(); - }); - - test('should not contain RecentlyAccessed panel when there is no recentlyAccessed history', async () => { - const component = await renderHome({ - recentlyAccessed: [], - }); + const component = await renderHome(); expect(component).toMatchSnapshot(); }); diff --git a/src/legacy/core_plugins/kibana/public/home/components/home_app.js b/src/legacy/core_plugins/kibana/public/home/components/home_app.js index 74d01a3bad70..798c543c59af 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/home_app.js +++ b/src/legacy/core_plugins/kibana/public/home/components/home_app.js @@ -31,12 +31,10 @@ import { import { getTutorial } from '../load_tutorials'; import { replaceTemplateStrings } from './tutorial/replace_template_strings'; import chrome from 'ui/chrome'; -import { recentlyAccessedShape } from './recently_accessed'; import { I18nProvider } from '@kbn/i18n/react'; export function HomeApp({ directories, - recentlyAccessed, }) { const isCloudEnabled = chrome.getInjected('isCloudEnabled', false); @@ -98,7 +96,6 @@ export function HomeApp({ directories={directories} apmUiEnabled={apmUiEnabled} mlEnabled={mlEnabled} - recentlyAccessed={recentlyAccessed} find={savedObjectsClient.find} localStorage={localStorage} urlBasePath={chrome.getBasePath()} @@ -120,5 +117,4 @@ HomeApp.propTypes = { showOnHomePage: PropTypes.bool.isRequired, category: PropTypes.string.isRequired })), - recentlyAccessed: PropTypes.arrayOf(recentlyAccessedShape).isRequired, }; diff --git a/src/legacy/core_plugins/kibana/public/home/components/synopsis.js b/src/legacy/core_plugins/kibana/public/home/components/synopsis.js index 5f3f60118b82..d7e503f656fc 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/synopsis.js +++ b/src/legacy/core_plugins/kibana/public/home/components/synopsis.js @@ -57,12 +57,12 @@ export function Synopsis({ description, iconUrl, iconType, title, url, wrapInPan {optionalImg} - +

{title}

- +

{description} diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap index 6d77035e8204..81a57826f14d 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap @@ -38,7 +38,7 @@ exports[`Header should render a different name, prompt, and beta tag if provided >

- +

- +

{ - if (url.includes('k6_colors_light')) { - return { file: url.replace('k6_colors_light', 'k6_colors_dark') }; + if (url.includes('eui_colors_light')) { + return { file: url.replace('eui_colors_light', 'eui_colors_dark') }; } return { file: url }; diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff new file mode 100644 index 000000000000..908f1912ba55 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff2 new file mode 100644 index 000000000000..bd14f008977e Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Black.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff new file mode 100644 index 000000000000..cab336ca9ae9 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2 new file mode 100644 index 000000000000..1740872acb11 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff new file mode 100644 index 000000000000..c4d9824070d6 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff2 new file mode 100644 index 000000000000..70e5f0066246 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Bold.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff new file mode 100644 index 000000000000..94aeeee923a4 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2 new file mode 100644 index 000000000000..18ed561d025b Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff new file mode 100644 index 000000000000..6f50a9ee8347 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2 new file mode 100644 index 000000000000..4c9e0b718d94 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff new file mode 100644 index 000000000000..ede913914485 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2 new file mode 100644 index 000000000000..af7822f92a0b Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff new file mode 100644 index 000000000000..dc7eefc25250 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2 new file mode 100644 index 000000000000..5508e70a6384 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff new file mode 100644 index 000000000000..37c434af7652 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2 new file mode 100644 index 000000000000..6dcfeac7b4fe Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff new file mode 100644 index 000000000000..4932f1e26e1a Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff2 new file mode 100644 index 000000000000..dbbd89279287 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Italic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff new file mode 100644 index 000000000000..56c3defcde21 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2 new file mode 100644 index 000000000000..f23481625b23 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff new file mode 100644 index 000000000000..94ceeda8f531 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2 new file mode 100644 index 000000000000..a99ed19507a6 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff new file mode 100644 index 000000000000..d18a8170133a Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff2 new file mode 100644 index 000000000000..3896022f3d1e Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Medium.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff new file mode 100644 index 000000000000..863ddc75a4e6 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2 new file mode 100644 index 000000000000..b9e43541e4fa Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff new file mode 100644 index 000000000000..aef2367d7fd4 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff2 new file mode 100644 index 000000000000..e75fb707b9d3 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Regular.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff new file mode 100644 index 000000000000..27e3d0b568c1 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2 new file mode 100644 index 000000000000..f21699d9ff0f Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff new file mode 100644 index 000000000000..3859942772a9 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2 new file mode 100644 index 000000000000..7b556d72d3b7 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff new file mode 100644 index 000000000000..296e229b0778 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2 new file mode 100644 index 000000000000..eba73d06fd39 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff new file mode 100644 index 000000000000..aae25d7b57aa Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2 new file mode 100644 index 000000000000..df5e5f86f530 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-italic.var.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-italic.var.woff2 new file mode 100644 index 000000000000..7aff5c010865 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-italic.var.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI-upright.var.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI-upright.var.woff2 new file mode 100644 index 000000000000..16b6adaa660a Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI-upright.var.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/Inter-UI.var.woff2 b/src/ui/public/assets/fonts/inter_ui/Inter-UI.var.woff2 new file mode 100644 index 000000000000..132600df3a27 Binary files /dev/null and b/src/ui/public/assets/fonts/inter_ui/Inter-UI.var.woff2 differ diff --git a/src/ui/public/assets/fonts/inter_ui/LICENSE.txt b/src/ui/public/assets/fonts/inter_ui/LICENSE.txt new file mode 100644 index 000000000000..da64fc78e7e8 --- /dev/null +++ b/src/ui/public/assets/fonts/inter_ui/LICENSE.txt @@ -0,0 +1,92 @@ +Copyright (c) 2016-2018 The Inter UI Project Authors (me@rsms.me) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.eot b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.eot deleted file mode 100644 index 019d4f706066..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.eot and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.svg b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.svg deleted file mode 100644 index c0a1c8cd788f..000000000000 --- a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.svg +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.ttf deleted file mode 100644 index 35cc356afbeb..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.ttf and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff deleted file mode 100644 index 38328c4ccd3f..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff2 deleted file mode 100644 index 4af454598593..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_300.woff2 and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.eot b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.eot deleted file mode 100644 index 2d978e8861ca..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.eot and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.svg b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.svg deleted file mode 100644 index 410561e7821c..000000000000 --- a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.svg +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.ttf deleted file mode 100644 index bc77ab679237..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.ttf and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff deleted file mode 100644 index 5a604b3a010d..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff2 deleted file mode 100644 index a0965b7a8990..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_600.woff2 and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.eot b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.eot deleted file mode 100644 index bf88bfad7824..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.eot and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.svg b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.svg deleted file mode 100644 index 8e6b61ade171..000000000000 --- a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.svg +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf deleted file mode 100644 index 11aec0f49e40..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff deleted file mode 100644 index 2523e953cb97..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 deleted file mode 100644 index 2b04b15bb70a..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot deleted file mode 100644 index 1a8b1160df0f..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg deleted file mode 100644 index 78eb653a75e6..000000000000 --- a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf deleted file mode 100644 index 9d4e8e526d7e..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff deleted file mode 100644 index e495e6f010c9..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff and /dev/null differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 deleted file mode 100644 index c8050c25f8c9..000000000000 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 and /dev/null differ diff --git a/src/ui/public/assets/fonts/readme.md b/src/ui/public/assets/fonts/readme.md new file mode 100644 index 000000000000..ed68c69f6ec3 --- /dev/null +++ b/src/ui/public/assets/fonts/readme.md @@ -0,0 +1,13 @@ +## Font usage + +Kibana packages two fonts: + +* [Inter UI](https://rsms.me/inter/) fonts were pulled from their site and are at v3.2 +* [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono) was pulled from the Google Fonts website on January 22, 2019. + +Licenses for both can be found in the folders below this root. + + +## How fonts are loaded + +Reference the `src/ui/ui_render/views/chrome.pug` which makes the font-face CSS declarations against the files contained here. References to those those faces are called directly in [EUI](https://github.com/elastic/eui) primarily through the [typography variables](https://github.com/elastic/eui/blob/master/src/global_styling/variables/_typography.scss). \ No newline at end of file diff --git a/src/ui/public/assets/fonts/open_sans/LICENSE.txt b/src/ui/public/assets/fonts/roboto_mono/LICENSE.txt old mode 100644 new mode 100755 similarity index 100% rename from src/ui/public/assets/fonts/open_sans/LICENSE.txt rename to src/ui/public/assets/fonts/roboto_mono/LICENSE.txt diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Bold.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Bold.ttf new file mode 100755 index 000000000000..07ef607d50c2 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Bold.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf new file mode 100755 index 000000000000..1cca0bf456a3 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Italic.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Italic.ttf new file mode 100755 index 000000000000..ef92c372cf47 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Italic.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Light.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Light.ttf new file mode 100755 index 000000000000..63229b2805b1 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Light.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf new file mode 100755 index 000000000000..f25bed56adba Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Medium.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Medium.ttf new file mode 100755 index 000000000000..88ff0c15a56b Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Medium.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf new file mode 100755 index 000000000000..307efad8fcaa Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Regular.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Regular.ttf new file mode 100755 index 000000000000..b158a334eb37 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Regular.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Thin.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Thin.ttf new file mode 100755 index 000000000000..309484d3239a Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-Thin.ttf differ diff --git a/src/ui/public/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf new file mode 100755 index 000000000000..e1bb9121ec65 Binary files /dev/null and b/src/ui/public/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf differ diff --git a/src/ui/public/markdown/_index.scss b/src/ui/public/markdown/_index.scss index 55d320c657fa..f997ea5384ea 100644 --- a/src/ui/public/markdown/_index.scss +++ b/src/ui/public/markdown/_index.scss @@ -1 +1 @@ -@import './github_markdown'; +@import './markdown'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/markdown.scss b/src/ui/public/markdown/_markdown.scss similarity index 57% rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/markdown.scss rename to src/ui/public/markdown/_markdown.scss index ce4fcdc03d6c..3c0c41799e70 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/markdown.scss +++ b/src/ui/public/markdown/_markdown.scss @@ -1,7 +1,5 @@ -@import '../../lib/eui.scss'; - -// Kibana Canvas - Default styles for Markdown element -// +// Default styles for Markdown element +// // 1. Links // 2. Headings // 3. Images @@ -12,38 +10,38 @@ // 8. Code blocks // Functions -// Note: The inlined base font size is set in common/functions/font.js. It should match $canvasMdFontSize. -$canvasDefaultFontSize: 14px; +// Note: The inlined base font size is set in common/functions/font.js. It should match $kbnMdFontSize. +$kbnDefaultFontSize: 14px; @function canvasToEm($size) { - @return #{$size / $canvasDefaultFontSize}em; + @return #{$size / $kbnDefaultFontSize}em; } -.canvas .canvasMarkdown { +.kbnMarkdown__body { // Font size variables - $canvasMarkdownFontSizeS: canvasToEm(12px); - $canvasMarkdownFontSize: canvasToEm(14px); - $canvasMarkdownFontSizeL: canvasToEm(20px); - $canvasMarkdownFontSizeXL: canvasToEm(28px); - $canvasMarkdownFontSizeXXL: canvasToEm(36px); + $kbnMarkdownFontSizeS: canvasToEm(12px); + $kbnMarkdownFontSize: canvasToEm(14px); + $kbnMarkdownFontSizeL: canvasToEm(20px); + $kbnMarkdownFontSizeXL: canvasToEm(28px); + $kbnMarkdownFontSizeXXL: canvasToEm(36px); // Spacing variables - $canvasMarkdownSizeL: canvasToEm(24px); - $canvasMarkdownSize: canvasToEm(16px); - $canvasMarkdownSizeS: canvasToEm(12px); - $canvasMarkdownSizeXS: canvasToEm(8px); - $canvasMarkdownSizeXXS: canvasToEm(4px); + $kbnMarkdownSizeL: canvasToEm(24px); + $kbnMarkdownSize: canvasToEm(16px); + $kbnMarkdownSizeS: canvasToEm(12px); + $kbnMarkdownSizeXS: canvasToEm(8px); + $kbnMarkdownSizeXXS: canvasToEm(4px); // Grayscale variables - $canvasMarkdownAlphaLightestShade: rgba(0,0,0,.05); - $canvasMarkdownAlphaLightShade: rgba(0,0,0,.15); - $canvasMarkdownAlphaDarkShade: rgba(0,0,0,.65); + $kbnMarkdownAlphaLightestShade: rgba(0,0,0,.05); + $kbnMarkdownAlphaLightShade: rgba(0,0,0,.15); + $kbnMarkdownAlphaDarkShade: rgba(0,0,0,.65); > *:first-child { margin-top: 0 !important; } - + > *:last-child { margin-bottom: 0 !important; } @@ -56,10 +54,10 @@ $canvasDefaultFontSize: 14px; table, pre { margin-top: 0; - margin-bottom: $canvasMarkdownSize; + margin-bottom: $kbnMarkdownSize; line-height: 1.5em; } - + strong { font-weight: 600; } @@ -69,11 +67,11 @@ $canvasDefaultFontSize: 14px; color: inherit; text-decoration: underline; } - + a:hover { text-decoration: underline dotted; } - + a:active, a:hover { outline-width: 0; @@ -92,41 +90,41 @@ $canvasDefaultFontSize: 14px; h5, h6 { margin-top: 0; - margin-bottom: $canvasMarkdownSizeXS; + margin-bottom: $kbnMarkdownSizeXS; } - + h1 { - font-size: $canvasMarkdownFontSizeXXL; + font-size: $kbnMarkdownFontSizeXXL; line-height: 1.333333em; font-weight: 300; } - + h2 { - font-size: $canvasMarkdownFontSizeXL; + font-size: $kbnMarkdownFontSizeXL; line-height: 1.428571em; font-weight: 300; } - + h3 { - font-size: $canvasMarkdownFontSizeL; + font-size: $kbnMarkdownFontSizeL; line-height: 1.6em; font-weight: 600; } - + h4 { - font-size: $canvasMarkdownSize; + font-size: $kbnMarkdownSize; line-height: 1.5em; font-weight: 600; } - + h5 { - font-size: $canvasMarkdownFontSize; + font-size: $kbnMarkdownFontSize; line-height: 1.142857em; font-weight: 700; } - + h6 { - font-size: $canvasMarkdownFontSizeS; + font-size: $kbnMarkdownFontSizeS; line-height: 1.333333em; font-weight: 700; text-transform: uppercase; @@ -138,11 +136,11 @@ $canvasDefaultFontSize: 14px; box-sizing: content-box; border-style: none; } - + // 4. Blockquotes blockquote { padding: 0 1em; - border-left: $canvasMarkdownSizeXXS solid $canvasMarkdownAlphaLightShade; + border-left: $kbnMarkdownSizeXXS solid $kbnMarkdownAlphaLightShade; } // 5. Horizontal rules @@ -151,37 +149,37 @@ $canvasDefaultFontSize: 14px; background: transparent; height: 2px; padding: 0; - margin: $canvasMarkdownSizeL 0; - background-color: $canvasMarkdownAlphaLightShade; + margin: $kbnMarkdownSizeL 0; + background-color: $kbnMarkdownAlphaLightShade; border: 0; } - + hr::before { display: table; content: ""; } - + hr::after { display: table; clear: both; content: ""; } - + // 6. Lists ul, ol { padding-left: 0; margin-top: 0; - margin-bottom: $canvasMarkdownSize; + margin-bottom: $kbnMarkdownSize; } - + ul { list-style-type: disc; } ol { list-style-type: decimal; } - + ul ul { list-style-type: circle; } @@ -190,23 +188,23 @@ $canvasDefaultFontSize: 14px; ul ol { list-style-type: lower-roman; } - + ul ul ol, ul ol ol, ol ul ol, ol ol ol { list-style-type: lower-alpha; } - + dd { margin-left: 0; } - + ul, ol { - padding-left: $canvasMarkdownSizeL; + padding-left: $kbnMarkdownSizeL; } - + ul ul, ul ol, ol ol, @@ -214,77 +212,77 @@ $canvasDefaultFontSize: 14px; margin-top: 0; margin-bottom: 0; } - + li > p { - margin-bottom: $canvasMarkdownSizeXS; + margin-bottom: $kbnMarkdownSizeXS; } - + li + li { - margin-top: $canvasMarkdownSizeXXS; + margin-top: $kbnMarkdownSizeXXS; } - + // 7. Tables table { display: block; width: 100%; overflow: auto; - border-left: 1px solid $canvasMarkdownAlphaLightShade; + border-left: 1px solid $kbnMarkdownAlphaLightShade; border-spacing: 0; border-collapse: collapse; } - + td, th { padding: 0; } - + table th, table td { - padding: $canvasMarkdownSizeXXS $canvasMarkdownSizeS; - border-top: 1px solid $canvasMarkdownAlphaLightShade; - border-bottom: 1px solid $canvasMarkdownAlphaLightShade; - + padding: $kbnMarkdownSizeXXS $kbnMarkdownSizeS; + border-top: 1px solid $kbnMarkdownAlphaLightShade; + border-bottom: 1px solid $kbnMarkdownAlphaLightShade; + &:last-child { - border-right: 1px solid $canvasMarkdownAlphaLightShade; + border-right: 1px solid $kbnMarkdownAlphaLightShade; } } - + table tr { background-color: transparent; - border-top: 1px solid $canvasMarkdownAlphaLightShade; + border-top: 1px solid $kbnMarkdownAlphaLightShade; } - + // 8. Code blocks code, pre { - margin-bottom: $canvasMarkdownSizeXS; + margin-bottom: $kbnMarkdownSizeXS; font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; - font-size: $canvasMarkdownFontSizeS; + font-size: $kbnMarkdownFontSizeS; } code { - padding: $canvasMarkdownSizeXXS 0; + padding: $kbnMarkdownSizeXXS 0; margin: 0; - background-color: $canvasMarkdownAlphaLightestShade; - border-radius: $canvasMarkdownSizeXXS; + background-color: $kbnMarkdownAlphaLightestShade; + border-radius: $kbnMarkdownSizeXXS; } - + code::before, code::after { letter-spacing: -0.2em; content: "\00a0"; } - + pre { - padding: $canvasMarkdownSize; + padding: $kbnMarkdownSize; overflow: auto; - font-size: $canvasMarkdownFontSizeS; + font-size: $kbnMarkdownFontSizeS; line-height: 1.333333em; - background-color: $canvasMarkdownAlphaLightestShade; - border-radius: $canvasMarkdownSizeXXS; + background-color: $kbnMarkdownAlphaLightestShade; + border-radius: $kbnMarkdownSizeXXS; word-wrap: normal; } - + pre code { display: inline; max-width: auto; @@ -296,7 +294,7 @@ $canvasDefaultFontSize: 14px; background-color: transparent; border: 0; } - + pre code::before, pre code::after { content: normal; diff --git a/src/ui/public/styles/_legacy/components/_sidebar.scss b/src/ui/public/styles/_legacy/components/_sidebar.scss index 7aabb5b86583..2050872b3a58 100644 --- a/src/ui/public/styles/_legacy/components/_sidebar.scss +++ b/src/ui/public/styles/_legacy/components/_sidebar.scss @@ -79,12 +79,13 @@ .sidebar-list-header { padding-left: $euiSizeS; padding-right: $euiSizeS; - color: $euiColorDarkShade; + color: $euiColorFullShade; border: 1px solid transparent; .sidebar-list-header-label { font-size: $euiFontSizeS; line-height: $euiLineHeight; + font-weight: $euiFontWeightBold; } } diff --git a/src/ui/public/styles/_styling_constants.scss b/src/ui/public/styles/_styling_constants.scss index 61e4c9d52305..0ca60cb6116f 100644 --- a/src/ui/public/styles/_styling_constants.scss +++ b/src/ui/public/styles/_styling_constants.scss @@ -1,6 +1,9 @@ // EUI global scope -@import '@elastic/eui/src/themes/k6/k6_globals'; -@import '@elastic/eui/src/themes/k6/k6_colors_light'; + +@import '@elastic/eui/src/themes/eui/eui_colors_light'; + +// Note that fonts are loaded directly by src/ui/ui_render/views/chrome.pug + @import '@elastic/eui/src/global_styling/functions/index'; @import '@elastic/eui/src/global_styling/variables/index'; @import '@elastic/eui/src/global_styling/mixins/index'; diff --git a/src/ui/public/styles/bootstrap/tables.less b/src/ui/public/styles/bootstrap/tables.less index bba29e970cc5..14dff80b8781 100644 --- a/src/ui/public/styles/bootstrap/tables.less +++ b/src/ui/public/styles/bootstrap/tables.less @@ -61,6 +61,7 @@ > th, > td { padding: @table-condensed-cell-padding; + font-size: 12px; } } } diff --git a/src/ui/ui_render/ui_render_mixin.js b/src/ui/ui_render/ui_render_mixin.js index c63388decc8d..e5f6c1402083 100644 --- a/src/ui/ui_render/ui_render_mixin.js +++ b/src/ui/ui_render/ui_render_mixin.js @@ -117,10 +117,10 @@ export function uiRenderMixin(kbnServer, server, config) { ...( darkMode ? [ - `${basePath}/node_modules/@elastic/eui/dist/eui_theme_k6_dark.css`, + `${basePath}/node_modules/@elastic/eui/dist/eui_theme_dark.css`, `${basePath}/node_modules/@kbn/ui-framework/dist/kui_dark.css`, ] : [ - `${basePath}/node_modules/@elastic/eui/dist/eui_theme_k6_light.css`, + `${basePath}/node_modules/@elastic/eui/dist/eui_theme_light.css`, `${basePath}/node_modules/@kbn/ui-framework/dist/kui_light.css`, ] ), diff --git a/src/ui/ui_render/views/chrome.pug b/src/ui/ui_render/views/chrome.pug index ca68c6e87a66..1f22757d5a7d 100644 --- a/src/ui/ui_render/views/chrome.pug +++ b/src/ui/ui_render/views/chrome.pug @@ -8,47 +8,233 @@ html(lang=locale) meta(name='viewport', content='width=device-width') title Kibana style. + /* INTER UI FONT */ + /* INTER UI FONT */ + /* INTER UI FONT */ + /* INTER UI FONT */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_300.woff2') format('woff2'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_300.woff') format('woff'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_300.ttf') format('truetype'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_300.svg#OpenSans') format('svg'); + font-family: 'Inter UI'; + font-style: normal; + font-weight: 100; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Thin-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Thin-BETA.woff") format("woff"); } @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_regular.woff2') format('woff2'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_regular.woff') format('woff'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_regular.ttf') format('truetype'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_regular.svg#OpenSans') format('svg'); - } - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_600.woff2') format('woff2'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_600.woff') format('woff'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_600.ttf') format('truetype'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_600.svg#OpenSans') format('svg'); - } - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_700.woff2') format('woff2'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_700.woff') format('woff'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_700.ttf') format('truetype'), - url('#{uiPublicUrl}/fonts/open_sans/open_sans_v15_latin_700.svg#OpenSans') format('svg'); + font-family: 'Inter UI'; + font-style: italic; + font-weight: 100; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff") format("woff"); } + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 200; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 200; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 300; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Light-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Light-BETA.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 300; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 400; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Regular.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Regular.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 400; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Italic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Italic.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 500; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Medium.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Medium.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 500; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-MediumItalic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-MediumItalic.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 600; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBold.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBold.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 600; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 700; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Bold.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Bold.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 700; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BoldItalic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BoldItalic.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 800; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBold.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBold.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 800; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff") format("woff"); + } + + @font-face { + font-family: 'Inter UI'; + font-style: normal; + font-weight: 900; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Black.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Black.woff") format("woff"); + } + @font-face { + font-family: 'Inter UI'; + font-style: italic; + font-weight: 900; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BlackItalic.woff2") format("woff2"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BlackItalic.woff") format("woff"); + } + + /* -------------------------------------------------------------------------- + Single variable font. + + Note that you may want to do something like this to make sure you're serving + constant fonts to older browsers: + html { + font-family: 'Inter UI', sans-serif; + } + @supports (font-variation-settings: normal) { + html { + font-family: 'Inter UI var', sans-serif; + } + } + + BUGS: + - Safari 12.0 will default to italic instead of regular when font-weight + is provided in a @font-face declaration. + Workaround: Use "Inter UI var alt" for Safari, or explicitly set + `font-variation-settings:"slnt" DEGREE`. + @font-face { + font-family: 'Inter UI var'; + font-weight: 100 900; + font-style: oblique 0deg 10deg; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI.var.woff2") format("woff2-variations"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI.var.woff2") format("woff2"); + } + + "Inter UI var alt" is recommended for Safari and Edge, for reliable italics. + + @supports (font-variation-settings: normal) { + html { + font-family: 'Inter UI var alt', sans-serif; + } + } + + @font-face { + font-family: 'Inter UI var alt'; + font-weight: 100 900; + font-style: normal; + font-named-instance: 'Regular'; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2 supports variations(gvar)"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2-variations"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2"); + } + @font-face { + font-family: 'Inter UI var alt'; + font-weight: 100 900; + font-style: italic; + font-named-instance: 'Italic'; + src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2 supports variations(gvar)"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2-variations"), + url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2"); + } + */ + + /* ROBOTO MONO FONTS */ + /* ROBOTO MONO FONTS */ + /* ROBOTO MONO FONTS */ + /* ROBOTO MONO FONTS */ + /* ROBOTO MONO FONTS */ + @font-face { + font-family: 'Roboto Mono'; + font-style: italic; + font-weight: 400; + src: local('Roboto Mono Italic'), local('RobotoMono-Italic'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Italic.ttf") format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: 'Roboto Mono'; + font-style: italic; + font-weight: 700; + src: local('Roboto Mono Bold Italic'), local('RobotoMono-BoldItalic'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-BoldItalic.ttf") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: 'Roboto Mono'; + font-style: normal; + font-weight: 400; + src: local('Roboto Mono'), local('RobotoMono-Regular'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Regular.ttf") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: 'Roboto Mono'; + font-style: normal; + font-weight: 700; + src: local('Roboto Mono Bold'), local('RobotoMono-Bold'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Bold.ttf") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } //- Favicons (generated from http://realfavicongenerator.net/) link( rel='apple-touch-icon' sizes='180x180' href=`${uiPublicUrl}/favicons/apple-touch-icon.png` diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js index 76fcbda03513..03098bb468a8 100644 --- a/test/functional/apps/discover/_discover.js +++ b/test/functional/apps/discover/_discover.js @@ -127,8 +127,7 @@ export default function ({ getService, getPageObjects }) { }); it('should show bars in the correct time zone', async function () { - const ticks = await PageObjects.discover.getBarChartXTicks(); - expect(ticks).to.eql([ + const maxTicks = [ '2015-09-20 00:00', '2015-09-20 12:00', '2015-09-21 00:00', @@ -137,7 +136,13 @@ export default function ({ getService, getPageObjects }) { '2015-09-22 12:00', '2015-09-23 00:00', '2015-09-23 12:00' - ]); + ]; + + for (const tick of await PageObjects.discover.getBarChartXTicks()) { + if (!maxTicks.includes(tick)) { + throw new Error(`unexpected x-axis tick "${tick}"`); + } + } }); it('should modify the time range when a bar is clicked', async function () { @@ -449,8 +454,8 @@ export default function ({ getService, getPageObjects }) { await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); await browser.refresh(); await PageObjects.header.setAbsoluteRange(fromTime, toTime); - const ticks = await PageObjects.discover.getBarChartXTicks(); - expect(ticks).to.eql([ + + const maxTicks = [ '2015-09-19 17:00', '2015-09-20 05:00', '2015-09-20 17:00', @@ -459,7 +464,13 @@ export default function ({ getService, getPageObjects }) { '2015-09-22 05:00', '2015-09-22 17:00', '2015-09-23 05:00' - ]); + ]; + + for (const tick of await PageObjects.discover.getBarChartXTicks()) { + if (!maxTicks.includes(tick)) { + throw new Error(`unexpected x-axis tick "${tick}"`); + } + } }); }); }); diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js index 6e7aedc25035..221a7ac92317 100644 --- a/test/functional/apps/discover/index.js +++ b/test/functional/apps/discover/index.js @@ -25,7 +25,7 @@ export default function ({ getService, loadTestFile }) { this.tags('ciGroup6'); before(function () { - return browser.setWindowSize(1250, 800); + return browser.setWindowSize(1300, 800); }); after(function unloadMakelogs() { diff --git a/test/functional/apps/visualize/_gauge_chart.js b/test/functional/apps/visualize/_gauge_chart.js index 070a9545b746..cc7c5f2ab765 100644 --- a/test/functional/apps/visualize/_gauge_chart.js +++ b/test/functional/apps/visualize/_gauge_chart.js @@ -68,10 +68,10 @@ export default function ({ getService, getPageObjects }) { await retry.try(async () => { expect(await PageObjects.visualize.getGaugeValue()).to.eql([ - '2,904\nwin 8', - '2,858\nwin xp', - '2,814\nwin 7', - '2,784\nios' + 'win 8', + 'win xp', + 'win 7', + 'ios' ]); }); }); diff --git a/test/functional/screenshots/baseline/area_chart.png b/test/functional/screenshots/baseline/area_chart.png index 1b7c457bb7d2..7b3469570409 100644 Binary files a/test/functional/screenshots/baseline/area_chart.png and b/test/functional/screenshots/baseline/area_chart.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js index dcc22f5d9f03..b05fbaae415e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js @@ -7,7 +7,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; import Markdown from 'markdown-it'; -import './markdown.scss'; const md = new Markdown(); @@ -22,7 +21,11 @@ export const markdown = () => ({ /* eslint-disable react/no-danger */ ReactDOM.render( -

, +
, domNode, () => handlers.done() ); diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss index c37755ba595e..751f8a8fb506 100644 --- a/x-pack/plugins/canvas/public/style/index.scss +++ b/x-pack/plugins/canvas/public/style/index.scss @@ -1,9 +1,4 @@ -// EUI global scope -@import '@elastic/eui/src/themes/k6/k6_globals'; -@import '@elastic/eui/src/themes/k6/k6_colors_light'; -@import '@elastic/eui/src/global_styling/functions/index'; -@import '@elastic/eui/src/global_styling/variables/index'; -@import '@elastic/eui/src/global_styling/mixins/index'; +@import 'ui/public/styles/styling_constants'; // Canvas core @import 'hackery'; 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 944d8fcec87c..c307cb6ab356 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 @@ -369,7 +369,7 @@ export class IndexTableUi extends Component {

- +

- +

{

- +

-
+

diff --git a/x-pack/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap index a95d29b96155..74f6c46a3f09 100644 --- a/x-pack/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap +++ b/x-pack/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap @@ -36,7 +36,7 @@ exports[`SpacesGridPage renders as expected 1`] = `

Organize your dashboards and other saved objects into meaningful categories. diff --git a/x-pack/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx index 8b04205825d3..00f89bdfa954 100644 --- a/x-pack/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx +++ b/x-pack/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx @@ -93,7 +93,7 @@ class SpacesGridPageUI extends Component { />

- +

{getSpacesFeatureDescription()}

 diff --git a/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list/watch_list.html b/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list/watch_list.html index 617d36180f66..7463eb105405 100644 --- a/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list/watch_list.html +++ b/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list/watch_list.html @@ -13,7 +13,7 @@ > Watcher

-
+