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.

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

EUI 6.10.0 & Background color fixes #30136

Merged
merged 8 commits into from
Feb 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"dependencies": {
"@elastic/datemath": "5.0.2",
"@elastic/eui": "6.8.0",
"@elastic/eui": "6.10.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.2",
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/public/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
flex: 1 1 auto;
position: relative;
padding: $euiSizeS;
background-color: $euiColorLightestShade;
// Make sure the editor actions don't create scrollbars on this container
// SASSTODO: Uncomment when tooltips are EUI-ified (inside portals)
// overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
flex: 1;
display: flex;
flex-direction: column;
background-color: $euiColorEmptyShade;
}

.dshAppContainer--withMargins {
background-color: $euiColorLightestShade;
}

.dshStartScreen {
Expand Down
8 changes: 0 additions & 8 deletions src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
// ANGULAR SELECTOR HACKS

/**
* Mimics EuiPageBackground
*/
dashboard-listing {
background-color: $euiColorLightestShade;
min-height: 100vh;
}

/**
* Needs to correspond with the react root nested inside angular.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@

.dshDashboardViewport-withMargins {
width: 100%;
background-color: $euiPageBackgroundColor;
}
5 changes: 5 additions & 0 deletions src/legacy/core_plugins/kibana/public/discover/_discover.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
discover-app {
background-color: $euiColorEmptyShade;
}

// SASSTODO: replace the margin-top value with a variable
.dscSidebar__listHeader {
margin-top: 5px;
Expand Down Expand Up @@ -175,6 +179,7 @@
}

.dscResults {

h3 {
margin: -20px 0 10px 0;
text-align: center;
Expand Down
5 changes: 0 additions & 5 deletions src/legacy/core_plugins/kibana/public/home/_home.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
home-app {
background-color: $euiColorLightestShade;
}

.homPage {
min-height: 100vh;
max-width: 1200px;
margin: auto;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,13 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1
<span
className="euiScreenReaderOnly"
>
Incomplete
Step
<EuiI18n
default="Incomplete Step"
token="euiStep.incompleteStep"
>
Incomplete Step
</EuiI18n>

</span>
</EuiScreenReaderOnly>
<EuiStepNumber
Expand Down Expand Up @@ -524,7 +529,13 @@ exports[`bulkCreate should display success message when bulkCreate is successful
<span
className="euiScreenReaderOnly"
>
Step
<EuiI18n
default="Step"
token="euiStep.completeStep"
>
Step
</EuiI18n>

</span>
</EuiScreenReaderOnly>
<EuiStepNumber
Expand All @@ -536,23 +547,17 @@ exports[`bulkCreate should display success message when bulkCreate is successful
<div
className="euiStepNumber euiStepNumber--complete euiStep__circle"
>
<EuiIcon
className="euiStepNumber__icon"
size="m"
title="complete"
type="check"
<EuiI18n
default="complete"
token="euiStepNumber.isComplete"
>
<check
className="euiIcon euiIcon--medium euiStepNumber__icon"
focusable="false"
height="16"
style={null}
<EuiIcon
className="euiStepNumber__icon"
size="m"
title="complete"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
type="check"
>
<svg
<check
className="euiIcon euiIcon--medium euiStepNumber__icon"
focusable="false"
height="16"
Expand All @@ -562,13 +567,24 @@ exports[`bulkCreate should display success message when bulkCreate is successful
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12"
fillRule="evenodd"
/>
</svg>
</check>
</EuiIcon>
<svg
className="euiIcon euiIcon--medium euiStepNumber__icon"
focusable="false"
height="16"
style={null}
title="complete"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12"
fillRule="evenodd"
/>
</svg>
</check>
</EuiIcon>
</EuiI18n>
</div>
</EuiStepNumber>
<EuiTitle
Expand Down
8 changes: 1 addition & 7 deletions src/legacy/core_plugins/kibana/public/management/_hacks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ kbn-management-objects-view {
display: block;
}

// SASSTODO: Remove when Kibana has a proper background color
kbn-management-objects, kbn-management-app, .tab-management {
background: $euiColorLightestShade;
flex-grow: 1;
}

#management-landing {
display: flex;
}
Expand Down Expand Up @@ -47,4 +41,4 @@ kbn-management-objects-view {
// Hack because the management wrapper is flat HTML and needs a class
.mgtPage__body {
max-width: map-get($euiBreakpoints, 'xl');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -387,38 +387,32 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
}
tabIndex={0}
>
<EuiButtonIcon
aria-label="Closes this modal window"
className="euiModal__closeIcon"
color="text"
iconSize="m"
iconType="cross"
onClick={[Function]}
type="button"
<EuiI18n
default="Closes this modal window"
token="euiModal.closeModal"
>
<button
<EuiButtonIcon
aria-label="Closes this modal window"
className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
className="euiModal__closeIcon"
color="text"
iconSize="m"
iconType="cross"
onClick={[Function]}
type="button"
>
<EuiIcon
aria-hidden="true"
className="euiButtonIcon__icon"
size="m"
type="cross"
<button
aria-label="Closes this modal window"
className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
onClick={[Function]}
type="button"
>
<cross
<EuiIcon
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
className="euiButtonIcon__icon"
size="m"
type="cross"
>
<svg
<cross
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
Expand All @@ -428,14 +422,25 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
/>
</svg>
</cross>
</EuiIcon>
</button>
</EuiButtonIcon>
<svg
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
/>
</svg>
</cross>
</EuiIcon>
</button>
</EuiButtonIcon>
</EuiI18n>
<div
className="euiModal__flex"
>
Expand Down Expand Up @@ -1325,38 +1330,32 @@ exports[`NewVisModal should render as expected 1`] = `
}
tabIndex={0}
>
<EuiButtonIcon
aria-label="Closes this modal window"
className="euiModal__closeIcon"
color="text"
iconSize="m"
iconType="cross"
onClick={[Function]}
type="button"
<EuiI18n
default="Closes this modal window"
token="euiModal.closeModal"
>
<button
<EuiButtonIcon
aria-label="Closes this modal window"
className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
className="euiModal__closeIcon"
color="text"
iconSize="m"
iconType="cross"
onClick={[Function]}
type="button"
>
<EuiIcon
aria-hidden="true"
className="euiButtonIcon__icon"
size="m"
type="cross"
<button
aria-label="Closes this modal window"
className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
onClick={[Function]}
type="button"
>
<cross
<EuiIcon
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
className="euiButtonIcon__icon"
size="m"
type="cross"
>
<svg
<cross
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
Expand All @@ -1366,14 +1365,25 @@ exports[`NewVisModal should render as expected 1`] = `
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
/>
</svg>
</cross>
</EuiIcon>
</button>
</EuiButtonIcon>
<svg
aria-hidden="true"
className="euiIcon euiIcon--medium euiButtonIcon__icon"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
/>
</svg>
</cross>
</EuiIcon>
</button>
</EuiButtonIcon>
</EuiI18n>
<div
className="euiModal__flex"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.visWizard__row {
flex: 1;
background-color: $euiColorLightestShade;
background-color: $euiColorEmptyShade;
}

.visWizard__column--small {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.tvbSeriesEditor__container {
padding: $euiSize;
background-color: $euiColorLightestShade;
}

@include euiPanel('tvbSeriesEditor');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.tvbEditor {
flex: 1;
background: $euiColorLightestShade;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.tvbPanelConfig__container {
padding: $euiSize;
background-color: $euiColorLightestShade;
}
Loading