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

[6.4] Fix centered dashboard listing (#21119) #21427

Merged
merged 2 commits into from
Jul 31, 2018
Merged

[6.4] Fix centered dashboard listing (#21119) #21427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3751dca
Fix centered dashboard listing (#21119)
snide Jul 24, 2018
34bef96
update tests
snide Jul 30, 2018
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
17 changes: 11 additions & 6 deletions ...core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ exports[`after fetch hideWriteControls 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
>
<EuiPageContent
className="dashboardLandingPageContent"
horizontalPosition="center"
panelPaddingSize="l"
>
Expand Down Expand Up @@ -37,9 +38,10 @@ exports[`after fetch initialFilter 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
>
<EuiPageContent
className="dashboardLandingPageContent"
horizontalPosition="center"
panelPaddingSize="l"
>
Expand Down Expand Up @@ -189,9 +191,10 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
>
<EuiPageContent
className="dashboardLandingPageContent"
horizontalPosition="center"
panelPaddingSize="l"
>
Expand Down Expand Up @@ -249,9 +252,10 @@ exports[`after fetch renders table rows 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
>
<EuiPageContent
className="dashboardLandingPageContent"
horizontalPosition="center"
panelPaddingSize="l"
>
Expand Down Expand Up @@ -401,9 +405,10 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
>
<EuiPageContent
className="dashboardLandingPageContent"
horizontalPosition="center"
panelPaddingSize="l"
>
Expand Down Expand Up @@ -584,7 +589,7 @@ exports[`renders empty page in before initial fetch to avoid flickering 1`] = `
restrictWidth={false}
>
<EuiPageBody
restrictWidth={true}
restrictWidth={false}
/>
</EuiPage>
`;
5 changes: 3 additions & 2 deletions src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ export class DashboardListing extends React.Component {
}

return (
<EuiPageContent horizontalPosition="center">
<EuiPageContent className="dashboardLandingPageContent" horizontalPosition="center">
{this.renderListingOrEmptyState()}
</EuiPageContent>
);
Expand All @@ -463,7 +463,8 @@ export class DashboardListing extends React.Component {
render() {
return (
<EuiPage data-test-subj="dashboardLandingPage" className="dashboardLandingPage">
<EuiPageBody restrictWidth>
{/* TODO: add restrictWidth prop on EuiPageBody here when [email protected] is applied */}
<EuiPageBody>
{this.renderPageContent()}
</EuiPageBody>
</EuiPage>
Expand Down
11 changes: 10 additions & 1 deletion src/core_plugins/kibana/public/dashboard/styles/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,16 @@ dashboard-viewport-provider {
}
}

.dashboardLandingPage {
// Mimics EuiPageBackground
dashboard-listing {
background-color: @globalColorLightestGray;
min-height: 100vh;
}

.dashboardLandingPage {
background: @globalColorLightestGray;
}

.dashboardLandingPageContent {
max-width: 1000px !important; // Temp fix till [email protected] is merged
}