Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] (Accessibility) Fix page heading structure #56741

Merged
merged 4 commits into from
Feb 6, 2020
Merged

[ML] (Accessibility) Fix page heading structure #56741

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
619e1e3
[ML] (Accessibility) Fix page heading structure
peteharverson Feb 4, 2020
365e183
[ML] Fix file datavisualizer SCSS import
peteharverson Feb 4, 2020
6f1de6b
[ML] Switch to EuiTitle for influencers list and data viz cards
peteharverson Feb 5, 2020
5efc092
[ML] Fix positioning of chart tooltip in Single Metric Viewer
peteharverson Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...cy/plugins/ml/public/application/components/create_job_link_card/create_job_link_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const CreateJobLinkCard: FC<Props> = ({
</EuiFlexItem>
<EuiFlexItem>
<EuiTitle size="s">
<h4>{title}</h4>
<h3>{title}</h3>
</EuiTitle>
<EuiText color="subdued">
<p>{description}</p>
Expand Down
23 changes: 16 additions & 7 deletions ...k/legacy/plugins/ml/public/application/components/influencers_list/_influencers_list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
.ml-influencers-list {
line-height: 1.45; // SASSTODO: Calc proper value

.influencer-title {
font-size: $euiFontSizeM - 2px;
font-weight: 600;
line-height: 24px;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible at all to use one of the pre-existing title sizing without overrides? We've created the title scale with the intention that we'd have consistency throughout all the apps in Kibana. I'm sure one of these sizes should fit this use case. http://eui.elastic.co/#/display/title

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cchaos good spot - I have managed to remove this override, plus another one I was using on the data visualizer cards in 6f1de6b.

I have decided to leave some panel-title overrides for headings on the Anomaly Explorer and Single Metric Viewer for now, to retain the current size (18px) and color. Note @mdefazio is currently looking at some options for headings and controls on these two pages, so we may be able to clean these up in a future PR.


.field-label {
font-size: $euiFontSizeXS;
text-align: left;
Expand All @@ -15,23 +21,23 @@
}

.progress {
display:inline-block;
width: calc(100% - 34px); // SASSTODO: Calc porper value
display: inline-block;
width: calc(100% - 34px); // SASSTODO: Calc proper value
height: 22px;
min-width: 70px;
margin-bottom: 0px;
color: $euiColorDarkShade;
background-color : transparent;
background-color: transparent;

.progress-bar-holder {
width: calc(100% - 28px); // SASSTODO: Calc porper value
width: calc(100% - 28px); // SASSTODO: Calc proper value
}

.progress-bar {
height: $euiSizeXS / 2;
margin-top: $euiSizeM;
text-align: right;
line-height: 18px; // SASSTODO: Calc porper value
line-height: 18px; // SASSTODO: Calc proper value
display: inline-block;
transition: none;
}
Expand All @@ -42,6 +48,7 @@
.progress-bar {
background-color: $mlColorCritical;
}

.score-label {
border-color: $mlColorCritical;
}
Expand All @@ -51,6 +58,7 @@
.progress-bar {
background-color: $mlColorMajor;
}

.score-label {
border-color: $mlColorMajor;
}
Expand All @@ -60,6 +68,7 @@
.progress-bar {
background-color: $mlColorMinor;
}

.score-label {
border-color: $mlColorMinor;
}
Expand All @@ -69,6 +78,7 @@
.progress-bar {
background-color: $mlColorWarning;
}

.score-label {
border-color: $mlColorWarning;
}
Expand Down Expand Up @@ -99,8 +109,7 @@
}
}

// SASSTODO: Can .eui-textBreakAll
// SASSTODO: Can .eui-textBreakAll
.ml-influencers-list-tooltip {
word-break: break-all;
}

20 changes: 12 additions & 8 deletions x-pack/legacy/plugins/ml/public/application/components/influencers_list/influencers_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import PropTypes from 'prop-types';
import React from 'react';

import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle, EuiToolTip } from '@elastic/eui';
import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle, EuiToolTip } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { abbreviateWholeNumber } from '../../formatters/abbreviate_whole_number';
Expand Down Expand Up @@ -114,8 +114,12 @@ function InfluencersByName({ influencerFieldName, influencerFilter, fieldValues

return (
<React.Fragment key={influencerFieldName}>
<EuiTitle size="xs" data-test-subj={`mlInfluencerFieldName ${influencerFieldName}`}>
<h4>{influencerFieldName}</h4>
<EuiTitle
size="xs"
className="influencer-title"
data-test-subj={`mlInfluencerFieldName ${influencerFieldName}`}
>
<h3>{influencerFieldName}</h3>
</EuiTitle>
<EuiSpacer size="xs" />
{influencerValues}
Expand All @@ -131,17 +135,17 @@ InfluencersByName.propTypes = {
export function InfluencersList({ influencers, influencerFilter }) {
if (influencers === undefined || Object.keys(influencers).length === 0) {
return (
<EuiFlexGroup justifyContent="spaceAround">
<EuiFlexGroup justifyContent="spaceAround" className="ml-influencers-list">
<EuiFlexItem grow={false}>
<EuiSpacer size="xxl" />
<EuiText>
<h4>
<EuiTitle size="xs" className="influencer-title">
<h3>
<FormattedMessage
id="xpack.ml.influencersList.noInfluencersFoundTitle"
defaultMessage="No influencers found"
/>
</h4>
</EuiText>
</h3>
</EuiTitle>
</EuiFlexItem>
</EuiFlexGroup>
);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ export const DatavisualizerSelector: FC = () => {
<EuiFlexGroup gutterSize="xl">
<EuiFlexItem grow={false}>
<EuiTitle size="l">
<h2>
<h1>
<FormattedMessage
id="xpack.ml.datavisualizer.selector.dataVisualizerTitle"
defaultMessage="Data Visualizer"
/>
</h2>
</h1>
</EuiTitle>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
3 changes: 0 additions & 3 deletions .../legacy/plugins/ml/public/application/datavisualizer/file_based/_file_datavisualizer.scss
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ins/ml/public/application/datavisualizer/file_based/components/about_panel/about_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ export function LoadingPanel() {
<EuiPageContent className="file-datavisualizer-about-panel__content" paddingSize="l">
<div style={{ textAlign: 'center' }}>
<EuiTitle size="s">
<h3 role="alert">
<h1 role="alert">
<FormattedMessage
id="xpack.ml.fileDatavisualizer.aboutPanel.analyzingDataTitle"
defaultMessage="Analyzing data"
/>
</h3>
</h1>
</EuiTitle>

<EuiSpacer size="l" />
Expand Down
4 changes: 2 additions & 2 deletions ...ml/public/application/datavisualizer/file_based/components/about_panel/welcome_content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function WelcomeContent() {
</EuiFlexItem>
<EuiFlexItem>
<EuiTitle size="m">
<h3>
<h1>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.welcomeContent.visualizeDataFromLogFileTitle"
defaultMessage="Visualize data from a log file&nbsp;{experimentalBadge}"
Expand All @@ -44,7 +44,7 @@ export function WelcomeContent() {
),
}}
/>
</h3>
</h1>
</EuiTitle>
<EuiSpacer size="s" />
<EuiText>
Expand Down
4 changes: 2 additions & 2 deletions ...lic/application/datavisualizer/file_based/components/analysis_summary/analysis_summary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ export function AnalysisSummary({ results }) {
return (
<React.Fragment>
<EuiTitle size="s">
<h3>
<h2>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.analysisSummary.summaryTitle"
defaultMessage="Summary"
/>
</h3>
</h2>
</EuiTitle>

<EuiSpacer size="m" />
Expand Down
4 changes: 2 additions & 2 deletions ...ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ export function FileContents({ data, format, numberOfLines }) {
return (
<React.Fragment>
<EuiTitle size="s">
<h3>
<h2>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileContents.fileContentsTitle"
defaultMessage="File contents"
/>
</h3>
</h2>
</EuiTitle>

<div>
Expand Down
10 changes: 8 additions & 2 deletions ...datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class FileDataVisualizerView extends Component {

this.state = {
files: {},
fileName: '',
fileContents: '',
fileSize: 0,
fileTooLarge: false,
Expand Down Expand Up @@ -71,6 +72,7 @@ export class FileDataVisualizerView extends Component {
loading: files.length > 0,
bottomBarVisible: files.length > 0,
loaded: false,
fileName: '',
fileContents: '',
fileSize: 0,
fileTooLarge: false,
Expand All @@ -93,6 +95,7 @@ export class FileDataVisualizerView extends Component {
const data = fileContents.data;
this.setState({
fileContents: data,
fileName: file.name,
fileSize: file.size,
});

Expand All @@ -110,6 +113,7 @@ export class FileDataVisualizerView extends Component {
loaded: false,
loading: false,
fileTooLarge: true,
fileName: file.name,
fileSize: file.size,
});
}
Expand Down Expand Up @@ -240,6 +244,7 @@ export class FileDataVisualizerView extends Component {
loaded,
results,
fileContents,
fileName,
fileSize,
fileTooLarge,
fileCouldNotBeRead,
Expand All @@ -256,7 +261,7 @@ export class FileDataVisualizerView extends Component {
: [];

return (
<div className="file-datavisualizer__content">
<div>
{mode === MODE.READ && (
<React.Fragment>
{!loading && !loaded && <AboutPanel onFilePickerChange={this.onFilePickerChange} />}
Expand All @@ -275,6 +280,7 @@ export class FileDataVisualizerView extends Component {
{loaded && (
<ResultsView
results={results}
fileName={fileName}
data={fileContents}
showEditFlyout={() => this.showEditFlyout()}
/>
Expand Down Expand Up @@ -304,8 +310,8 @@ export class FileDataVisualizerView extends Component {
<React.Fragment>
<ImportView
results={results}
fileName={fileName}
fileContents={fileContents}
fileSize={fileSize}
indexPatterns={this.props.indexPatterns}
kibanaConfig={this.props.kibanaConfig}
showBottomBar={this.showBottomBar}
Expand Down
Loading