From 23454acd033c5a6c6f56947b472a62f1259025a1 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Thu, 11 Jan 2018 13:44:36 -0800 Subject: [PATCH 1/6] Homepage / index pattern cleanup --- .../home/components/feature_directory.js | 69 ++++++++-------- .../kibana/public/home/components/home.js | 43 +++++----- .../kibana/public/home/components/synopsis.js | 32 ++++---- .../home/components/tutorial/copy_button.js | 8 +- .../home/components/tutorial/instruction.js | 4 +- .../components/tutorial/introduction.less | 2 +- .../home/components/tutorial/tutorial.js | 12 +-- .../home/components/tutorial/tutorial.less | 9 --- .../home/components/tutorial_directory.js | 79 +++++++++++-------- .../create_index_pattern_wizard.html | 7 +- 10 files changed, 137 insertions(+), 128 deletions(-) diff --git a/src/core_plugins/kibana/public/home/components/feature_directory.js b/src/core_plugins/kibana/public/home/components/feature_directory.js index c79ac1078b5d6..2326496200833 100644 --- a/src/core_plugins/kibana/public/home/components/feature_directory.js +++ b/src/core_plugins/kibana/public/home/components/feature_directory.js @@ -2,11 +2,16 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Synopsis } from './synopsis'; import { - KuiTabs, - KuiTab, - KuiFlexItem, - KuiFlexGrid, -} from 'ui_framework/components'; + EuiTabs, + EuiTab, + EuiFlexItem, + EuiFlexGrid, + EuiPage, + EuiTitle, + EuiPanel, + EuiSpacer, +} from '@elastic/eui'; + import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; const ALL_TAB_ID = 'all'; @@ -51,14 +56,14 @@ export class FeatureDirectory extends React.Component { renderTabs = () => { return this.tabs.map((tab, index) => ( - this.onSelectedTabChanged(tab.id)} isSelected={tab.id === this.state.selectedTabId} key={index} > {tab.name} - + )); } @@ -75,37 +80,37 @@ export class FeatureDirectory extends React.Component { }) .map((directory) => { return ( - - - + + + + + ); }); }; render() { return ( -
-
-
-

- Directory -

-
-
- - {this.renderTabs()} - - - { this.renderDirectories() } - -
-
-
+ + +

+ Directory +

+ + + + {this.renderTabs()} + + + + { this.renderDirectories() } + + ); } } diff --git a/src/core_plugins/kibana/public/home/components/home.js b/src/core_plugins/kibana/public/home/components/home.js index 4b1e53f2ff7cc..3a31521b1fc8f 100644 --- a/src/core_plugins/kibana/public/home/components/home.js +++ b/src/core_plugins/kibana/public/home/components/home.js @@ -20,6 +20,7 @@ import { EuiFlexItem, EuiFlexGrid, EuiText, + EuiTextColor, } from '@elastic/eui'; import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; @@ -56,7 +57,7 @@ export function Home({ addBasePath, directories }) { return (
- + - + - +

Add Data to Kibana

+ +

+ These turnkey solutions will help you quickly add data into Kibana and turn it into + pre-built dashboards and monitoring systems. +

+ - - -

+ + +

Data already in Elasticsearch?

- - - - - Set up index patterns - - - - + + + + + + Set up index patterns + + -

- These turnkey solutions will help you quickly add data into Kibana and turn it into - pre-built dashboards and monitoring systems. -

{ renderPromo() } diff --git a/src/core_plugins/kibana/public/home/components/synopsis.js b/src/core_plugins/kibana/public/home/components/synopsis.js index a336d777860e0..a1f8ee27fe3af 100644 --- a/src/core_plugins/kibana/public/home/components/synopsis.js +++ b/src/core_plugins/kibana/public/home/components/synopsis.js @@ -2,19 +2,21 @@ import './synopsis.less'; import React from 'react'; import PropTypes from 'prop-types'; import { - KuiFlexGroup, - KuiFlexItem -} from 'ui_framework/components'; + EuiFlexGroup, + EuiFlexItem +} from '@elastic/eui'; export function Synopsis({ description, iconUrl, title, url }) { - let img; + let optionalImg; if (iconUrl) { - img = ( - + optionalImg = ( + + + ); } @@ -24,17 +26,17 @@ export function Synopsis({ description, iconUrl, title, url }) { className="kuiLink synopsis" data-test-subj={`homeSynopsisLink${title.toLowerCase()}`} > - - {img} - + + {optionalImg} +

{title}

{description}

- - + + ); } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/copy_button.js b/src/core_plugins/kibana/public/home/components/tutorial/copy_button.js index ffb45ddbff361..480c78220abbc 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/copy_button.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/copy_button.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Tooltip } from 'pivotal-ui/react/tooltip'; import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger'; -import { KuiButton } from 'ui_framework/components'; +import { EuiButton } from '@elastic/eui'; import { copyToClipboard } from '../../copy_to_clipboard'; const UNCOPIED_MSG = 'Copy to clipboard'; @@ -43,13 +43,13 @@ export class CopyButton extends React.Component { } > - Copy snippet - + ); } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js index 02fef8807c2ca..527820588b5c1 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js @@ -24,7 +24,7 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT if (textPost) { post = (
- + @@ -43,7 +43,7 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT ); commandBlock = (
- + {cmdText} diff --git a/src/core_plugins/kibana/public/home/components/tutorial/introduction.less b/src/core_plugins/kibana/public/home/components/tutorial/introduction.less index cd3b8d106fef8..b2caa9977cf85 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/introduction.less +++ b/src/core_plugins/kibana/public/home/components/tutorial/introduction.less @@ -1,3 +1,3 @@ .introduction { - margin: 24px; + margin: 24px 0; } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js index df59059c44b28..a22c61cdaafa2 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js @@ -5,6 +5,7 @@ import PropTypes from 'prop-types'; import { Introduction } from './introduction'; import { InstructionSet } from './instruction_set'; import { RadioButtonGroup } from './radio_button_group'; +import { EuiSpacer, EuiPage, EuiPanel } from '@elastic/eui'; const INSTRUCTIONS_TYPE = { ELASTIC_CLOUD: 'elasticCloud', @@ -185,23 +186,24 @@ export class Tutorial extends React.Component { exportedFieldsUrl={exportedFieldsUrl} /> -
+
{this.renderInstructionSetsToggle()}
-
+ + {this.renderInstructionSets(instructions)} -
+
); } return ( -
+
Home / Add Data {content}
-
+ ); } } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.less b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.less index ddc39e54f04f0..855a6a0f97746 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.less +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.less @@ -1,12 +1,3 @@ -.tutorialContent { - /* - * 1. remove bottom margin placed on p element by bootstrap - */ - p { - margin-bottom: 0; /* 1 */ - } -} - .text-center > .kuiButtonGroup { display: inline-block !important; } diff --git a/src/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/core_plugins/kibana/public/home/components/tutorial_directory.js index c8ab44334bc7a..fad6066436754 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial_directory.js +++ b/src/core_plugins/kibana/public/home/components/tutorial_directory.js @@ -1,12 +1,19 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Synopsis } from './synopsis'; + import { - KuiTabs, - KuiTab, - KuiFlexItem, - KuiFlexGrid, -} from 'ui_framework/components'; + EuiPage, + EuiTabs, + EuiTab, + EuiFlexItem, + EuiFlexGrid, + EuiSpacer, + EuiTitle, + EuiPanel, +} from '@elastic/eui'; + + import { getTutorials } from '../load_tutorials'; const ALL = 'all'; @@ -55,14 +62,14 @@ export class TutorialDirectory extends React.Component { renderTabs = () => { return this.tabs.map((tab, index) => ( - this.onSelectedTabChanged(tab.id)} isSelected={tab.id === this.state.selectedTabId} key={index} > {tab.name} - + )); } @@ -76,40 +83,42 @@ export class TutorialDirectory extends React.Component { }) .map((tutorial) => { return ( - - - + + + + + ); }); }; render() { return ( -
-
- -
- Home -

- Add Data to Kibana -

-
- -
- - {this.renderTabs()} - - - { this.renderTutorials() } - -
- -
-
+ + + Home + + +

+ Add Data to Kibana +

+ + + + + + {this.renderTabs()} + + + + { this.renderTutorials() } + + + ); } } diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html index 732458288d59f..b2eb9d18a43eb 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html @@ -39,6 +39,7 @@

@@ -83,16 +84,16 @@

ng-if="!controller.isFetchingExistingIndices" >
-

+

Couldn't find any Elasticsearch data

-

+

You'll need to index some data into Elasticsearch before you can create an index pattern. Date: Thu, 11 Jan 2018 23:55:27 -0800 Subject: [PATCH 2/6] remove brute force focus from eui components --- ui_framework/dist/ui_framework.css | 2 +- ui_framework/src/global_styling/reset/_reset.scss | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css index d5df4f94572a2..6df321d72e511 100644 --- a/ui_framework/dist/ui_framework.css +++ b/ui_framework/dist/ui_framework.css @@ -54,7 +54,7 @@ * 4. Fix an IE bug which causes the last child to overflow the container. * 5. Fixing this bug means we now need to align the children to the right. */ -:focus { +:focus:not([class^="eui"]) { z-index: 1; /* 1 */ outline: none !important; diff --git a/ui_framework/src/global_styling/reset/_reset.scss b/ui_framework/src/global_styling/reset/_reset.scss index 51fc3932e2941..83ebbd33cb25e 100644 --- a/ui_framework/src/global_styling/reset/_reset.scss +++ b/ui_framework/src/global_styling/reset/_reset.scss @@ -1,6 +1,10 @@ -// Removes outline, but still provides a two color box shadow that works anywhere. +// We apply brute force focus states to anything not coming from Eui +// which has focus states designed at the component level. :focus { - @include focus; + &:not([class^="eui"]), + { + @include focus; + } } /** From 0f4470496f0b9f2cf946b03d680276c49749bb15 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Fri, 12 Jan 2018 10:29:00 -0800 Subject: [PATCH 3/6] max width home pages, adjust margins on steps --- .../kibana/public/home/components/home.js | 2 + .../__snapshots__/tutorial.test.js.snap | 38 ++++++++++++------- .../home/components/tutorial/instruction.js | 2 + .../home/components/tutorial/tutorial.js | 6 +-- src/core_plugins/kibana/public/home/home.less | 7 +++- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/core_plugins/kibana/public/home/components/home.js b/src/core_plugins/kibana/public/home/components/home.js index 3a31521b1fc8f..8a220a543163b 100644 --- a/src/core_plugins/kibana/public/home/components/home.js +++ b/src/core_plugins/kibana/public/home/components/home.js @@ -175,6 +175,8 @@ export function Home({ addBasePath, directories }) { + + { renderPromo() } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap index 72a0209d9d6f4..ba7e5937e4316 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should render ELASTIC_CLOUD instructions when isCloudEnabled is true 1`] = ` -

+ `; exports[`should render ON_PREM instructions with instructions cloud toggle when isCloudEnabled is false 1`] = ` -
-
+ -
+
-
+ `; diff --git a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js index 527820588b5c1..106609942da62 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js @@ -71,6 +71,8 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT {post} + +

); } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js index a22c61cdaafa2..7a5caf48a36b3 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js @@ -199,10 +199,8 @@ export class Tutorial extends React.Component { } return ( -
- Home / Add Data - {content} -
+ Home / Add Data + {content} ); } diff --git a/src/core_plugins/kibana/public/home/home.less b/src/core_plugins/kibana/public/home/home.less index df4ed0ddfb0ca..c6fae8997620e 100644 --- a/src/core_plugins/kibana/public/home/home.less +++ b/src/core_plugins/kibana/public/home/home.less @@ -1,8 +1,13 @@ @import (reference) "~ui/styles/variables.less"; -.home { +home-app { background-color: @globalColorLightestGray; +} + +.home { min-height: 100vh; + max-width: 1100px; + margin: auto; } .kuiCard__descriptionTitle img { From f030b3bc07f30e535ef4c5a9883e4ea995ebaec1 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Fri, 12 Jan 2018 10:56:43 -0800 Subject: [PATCH 4/6] fix spacing around breadcrumbs --- .../home/components/tutorial/content.js | 2 +- .../home/components/tutorial/introduction.js | 36 ++++++++----------- .../home/components/tutorial/tutorial.js | 14 +++++--- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/core_plugins/kibana/public/home/components/tutorial/content.js b/src/core_plugins/kibana/public/home/components/tutorial/content.js index abba5839bb30a..43fffd688babb 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/content.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/content.js @@ -21,7 +21,7 @@ markdownIt.renderer.rules.link_open = function (tokens, idx, options, env, self) }; export function Content({ className, text }) { - const classes = classNames('kuiText kuiSubduedText tutorialContent markdown-body', className); + const classes = classNames('euiText euiTextColor--subdued tutorialContent markdown-body', className); return (
-
- -
-

- {title} -

- - {exportedFields} -
- -
- {img} -
- -
-
+ + + +

{title}

+ + + + {exportedFields} + + + {img} + + ); } diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js index 7a5caf48a36b3..943fd6231aed7 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import { Introduction } from './introduction'; import { InstructionSet } from './instruction_set'; import { RadioButtonGroup } from './radio_button_group'; -import { EuiSpacer, EuiPage, EuiPanel } from '@elastic/eui'; +import { EuiSpacer, EuiPage, EuiPanel, EuiLink, EuiText } from '@elastic/eui'; const INSTRUCTIONS_TYPE = { ELASTIC_CLOUD: 'elasticCloud', @@ -158,9 +158,11 @@ export class Tutorial extends React.Component { if (this.state.notFound) { content = (
-

- Unable to find tutorial {this.props.tutorialId} -

+ +

+ Unable to find tutorial {this.props.tutorialId} +

+
); } @@ -199,7 +201,9 @@ export class Tutorial extends React.Component { } return ( - Home / Add Data + + Home / Add Data + {content} ); From 5ba58c2720846acf692042f658a2e23b0648ce4c Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Fri, 12 Jan 2018 11:47:39 -0800 Subject: [PATCH 5/6] fix focus states for synopsis --- .../home/components/feature_directory.js | 16 +++--- .../kibana/public/home/components/home.js | 11 ++-- .../kibana/public/home/components/synopsis.js | 53 ++++++++++++++----- .../public/home/components/synopsis.less | 20 +++++-- .../home/components/tutorial/introduction.js | 1 - .../components/tutorial/introduction.less | 3 -- .../home/components/tutorial/tutorial.js | 1 + .../home/components/tutorial_directory.js | 14 +++-- src/core_plugins/kibana/public/home/home.less | 2 +- 9 files changed, 76 insertions(+), 45 deletions(-) delete mode 100644 src/core_plugins/kibana/public/home/components/tutorial/introduction.less diff --git a/src/core_plugins/kibana/public/home/components/feature_directory.js b/src/core_plugins/kibana/public/home/components/feature_directory.js index 2326496200833..df85c96afcfc6 100644 --- a/src/core_plugins/kibana/public/home/components/feature_directory.js +++ b/src/core_plugins/kibana/public/home/components/feature_directory.js @@ -8,7 +8,6 @@ import { EuiFlexGrid, EuiPage, EuiTitle, - EuiPanel, EuiSpacer, } from '@elastic/eui'; @@ -81,14 +80,13 @@ export class FeatureDirectory extends React.Component { .map((directory) => { return ( - - - + ); }); diff --git a/src/core_plugins/kibana/public/home/components/home.js b/src/core_plugins/kibana/public/home/components/home.js index 8a220a543163b..cffdfaab7d7c0 100644 --- a/src/core_plugins/kibana/public/home/components/home.js +++ b/src/core_plugins/kibana/public/home/components/home.js @@ -78,7 +78,7 @@ export function Home({ addBasePath, directories }) { buttonType="secondary" href={addBasePath(`${kbnBaseUrl}#/home/tutorial_directory/logging`)} > - Add data + Add log data @@ -104,7 +104,7 @@ export function Home({ addBasePath, directories }) { buttonType="secondary" href={addBasePath(`${kbnBaseUrl}#/home/tutorial_directory/metrics`)} > - Add data + Add metric data @@ -116,7 +116,7 @@ export function Home({ addBasePath, directories }) { src={addBasePath('/plugins/kibana/assets/app_security.svg')} />

- Security Analytics + Security analytics

@@ -130,7 +130,7 @@ export function Home({ addBasePath, directories }) { buttonType="secondary" href={addBasePath(`${kbnBaseUrl}#/home/tutorial_directory/security`)} > - Add data + Add security events @@ -152,8 +152,7 @@ export function Home({ addBasePath, directories }) {

- These turnkey solutions will help you quickly add data into Kibana and turn it into - pre-built dashboards and monitoring systems. + Use these solutions to quickly turn your data into pre-built dashboards and monitoring systems.

diff --git a/src/core_plugins/kibana/public/home/components/synopsis.js b/src/core_plugins/kibana/public/home/components/synopsis.js index a1f8ee27fe3af..0c2bda748d616 100644 --- a/src/core_plugins/kibana/public/home/components/synopsis.js +++ b/src/core_plugins/kibana/public/home/components/synopsis.js @@ -3,10 +3,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGroup, - EuiFlexItem + EuiFlexItem, + EuiPanel, + EuiTitle, + EuiText, + EuiTextColor, } from '@elastic/eui'; -export function Synopsis({ description, iconUrl, title, url }) { +export function Synopsis({ description, iconUrl, title, url, wrapInPanel }) { let optionalImg; if (iconUrl) { optionalImg = ( @@ -20,23 +24,44 @@ export function Synopsis({ description, iconUrl, title, url }) { ); } + const content = ( + + {optionalImg} + + +

+ {title} +

+ + +

+ + {description} + +

+ + + + ); + + let synopsisDisplay = content; + if (wrapInPanel) { + synopsisDisplay = ( + + {content} + + ); + } + + + return ( - - {optionalImg} - -

- {title} -

-

- {description} -

- - + {synopsisDisplay} ); } diff --git a/src/core_plugins/kibana/public/home/components/synopsis.less b/src/core_plugins/kibana/public/home/components/synopsis.less index 583270d2384c5..2bbc652b02aa5 100644 --- a/src/core_plugins/kibana/public/home/components/synopsis.less +++ b/src/core_plugins/kibana/public/home/components/synopsis.less @@ -1,19 +1,33 @@ @import (reference) "~ui/styles/variables.less"; +.synopsis { + display: flex; + flex-grow: 1; +} + .synopsis:hover { text-decoration: none; - .kuiTextTitle { + .synopsisTitle { text-decoration: underline; } } -.synopsisContent { - margin-left: 10px !important; +.synopsis:focus { + text-decoration: none; + + .synopsisPanel { + border: solid 1px @globalColorBlue; + } + + .synopsisBody { + text-decoration: none; + } } .synopsisTitle { font-size: 16px; font-weight: normal; + color: @globalColorBlue; } .synopsisIcon { diff --git a/src/core_plugins/kibana/public/home/components/tutorial/introduction.js b/src/core_plugins/kibana/public/home/components/tutorial/introduction.js index 961401630ca48..c5ed87312dcdb 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/introduction.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/introduction.js @@ -1,4 +1,3 @@ -import './introduction.less'; import React from 'react'; import PropTypes from 'prop-types'; import { Content } from './content'; diff --git a/src/core_plugins/kibana/public/home/components/tutorial/introduction.less b/src/core_plugins/kibana/public/home/components/tutorial/introduction.less deleted file mode 100644 index b2caa9977cf85..0000000000000 --- a/src/core_plugins/kibana/public/home/components/tutorial/introduction.less +++ /dev/null @@ -1,3 +0,0 @@ -.introduction { - margin: 24px 0; -} diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js index 943fd6231aed7..f99208fc7bdad 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js @@ -188,6 +188,7 @@ export class Tutorial extends React.Component { exportedFieldsUrl={exportedFieldsUrl} /> +
{this.renderInstructionSetsToggle()}
diff --git a/src/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/core_plugins/kibana/public/home/components/tutorial_directory.js index fad6066436754..dbb4a6dc92615 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial_directory.js +++ b/src/core_plugins/kibana/public/home/components/tutorial_directory.js @@ -10,7 +10,6 @@ import { EuiFlexGrid, EuiSpacer, EuiTitle, - EuiPanel, } from '@elastic/eui'; @@ -84,13 +83,12 @@ export class TutorialDirectory extends React.Component { .map((tutorial) => { return ( - - - + ); }); diff --git a/src/core_plugins/kibana/public/home/home.less b/src/core_plugins/kibana/public/home/home.less index c6fae8997620e..b6e372103e5dc 100644 --- a/src/core_plugins/kibana/public/home/home.less +++ b/src/core_plugins/kibana/public/home/home.less @@ -6,7 +6,7 @@ home-app { .home { min-height: 100vh; - max-width: 1100px; + max-width: 1200px; margin: auto; } From ae17c9922d0fd9a2bc37023b9b4cabcfbb80f2e0 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Fri, 12 Jan 2018 14:47:53 -0800 Subject: [PATCH 6/6] snapshots --- .../__snapshots__/content.test.js.snap | 2 +- .../__snapshots__/tutorial.test.js.snap | 246 +++++++++--------- 2 files changed, 128 insertions(+), 120 deletions(-) diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap index 95d8e79fb5eef..73ee924f266a7 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap @@ -2,7 +2,7 @@ exports[`should render content with markdown 1`] = `
I am some content with markdown

diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap index ba7e5937e4316..8f40f1838e3f8 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap @@ -4,60 +4,64 @@ exports[`should render ELASTIC_CLOUD instructions when isCloudEnabled is true 1` -
- - Home - - / - + / + + Add Data + + +
+ + +
+ + - Add Data - -
- -
- - - - -
+
`; @@ -66,78 +70,82 @@ exports[`should render ON_PREM instructions with instructions cloud toggle when -