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

[7.x] [Canvas] K7 design related fixes (#30833) #30968

Merged
merged 1 commit into from
Feb 13, 2019
Merged

[7.x] [Canvas] K7 design related fixes (#30833) #30968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$canvasLayoutFontSize: $euiFontSizeS;

.canvasLayout {
display: flex;
background: $euiPageBackgroundColor;
Expand Down Expand Up @@ -29,6 +31,7 @@
flex-grow: 0;
flex-basis: auto;
padding: $euiSizeM $euiSize $euiSizeS $euiSize;
font-size: $canvasLayoutFontSize;
}

.canvasLayout__stageContent {
Expand Down Expand Up @@ -69,4 +72,5 @@
width: 100%;
background-color: $euiPageBackgroundColor;
z-index: $euiZNavigation;
font-size: $canvasLayoutFontSize;
}
4 changes: 1 addition & 3 deletions x-pack/plugins/canvas/public/components/asset_manager/asset_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,7 @@ export class AssetManager extends React.PureComponent {

return (
<Fragment>
<EuiButtonEmpty size="s" onClick={this.showModal}>
Manage assets
</EuiButtonEmpty>
<EuiButtonEmpty onClick={this.showModal}>Manage assets</EuiButtonEmpty>

{assetModal}

Expand Down
12 changes: 3 additions & 9 deletions x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
body.canvas-isFullscreen {
// this is a hack that overwrites Kibana's core chrome
.kbnGlobalNav.kbnGlobalNav-isOpen + .app-wrapper,
.app-wrapper {
// remove space for global nav elements
.header-global-wrapper + .app-wrapper {
left: 0;
top: 0;
}

// set the background color
Expand All @@ -11,7 +11,6 @@ body.canvas-isFullscreen {
}

// hide all the interface parts
nav.kbnGlobalNav, // K6 global side nav
.header-global-wrapper, // K7 global top nav
.canvasLayout__stageHeader,
.canvasLayout__sidebar,
Expand All @@ -20,11 +19,6 @@ body.canvas-isFullscreen {
display: none;
}

// remove space for K7 global top nav
.header-global-wrapper + .app-wrapper {
top: 0;
}

.canvasLayout__stageContentOverflow {
display: block; // fixes center alignment for Safari
overflow: visible;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const RefreshControl = ({ inFlight, setRefreshInterval, refreshInterval,
const setRefresh = val => setRefreshInterval(getRefreshInterval(val));

const popoverButton = handleClick => (
<EuiButtonEmpty size="s" onClick={handleClick}>
<EuiButtonEmpty onClick={handleClick}>
<div style={{ display: 'flex', alignItems: 'center' }}>
{inFlight && (
<Fragment>
Expand Down
8 changes: 2 additions & 6 deletions x-pack/plugins/canvas/public/components/router/canvas_loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ export const CanvasLoading = ({ msg }) => (
<EuiPanel>
<EuiLoadingChart size="m" />
<EuiSpacer size="s" />
<EuiText>
{/*
For some reason a styled color is required,
likely something with the chrome css from Kibana
*/}
<p style={{ color: '#000' }}>{msg}</p>
<EuiText color="default" size="s">
<p>{msg}</p>
</EuiText>
</EuiPanel>
</div>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/public/components/sidebar/sidebar_component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const SidebarComponent = ({
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
<EuiTabbedContent tabs={tabs} initialSelectedTab={tabs[0]} />
<EuiTabbedContent tabs={tabs} initialSelectedTab={tabs[0]} size="s" />
</div>
)}
</div>
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ export class WorkpadLoader extends React.PureComponent {
<Fragment>
<WorkpadDropzone onUpload={this.onUpload} disabled={createPending || !canUserWrite}>
<EuiBasicTable
compressed
items={rows}
itemId="id"
columns={columns}
Expand Down