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

[ML] convert Less to Scss #25574

Merged
merged 6 commits into from
Nov 15, 2018
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
30 changes: 30 additions & 0 deletions x-pack/plugins/ml/public/_app.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// ML has app specific coloring for it's various warning levels.
// These are used almost everywhere.

.ml-icon-severity-critical,
.ml-icon-severity-major,
.ml-icon-severity-minor,
.ml-icon-severity-warning,
.ml-icon-severity-unknown {
text-shadow: 1px 1px 1px $euiColorLightShade;
}

.ml-icon-severity-critical {
color: $mchColorCriticalText;
}

.ml-icon-severity-major {
color: $mchColorMajorText;
}

.ml-icon-severity-minor {
color: $mchColorMinorText;
}

.ml-icon-severity-warning {
color: $mchColorWarningText;
}

.ml-icon-severity-unknown {
color: $mchColorUnknownText;
}
walterra marked this conversation as resolved.
Show resolved Hide resolved
60 changes: 60 additions & 0 deletions x-pack/plugins/ml/public/_hacks.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// These are hacks that were near ML's root. Unsure if they still need to be here.
.tab-jobs,
.edit-job-modal,
.create-watch-modal {
label {
display: inline-block;
}

.validation-error {
margin-top: $euiSizeXS;
}
}

// ML specific bootstrap hacks
.button-wrapper {
display: inline;
}

.button-wrapper.disabled .kuiButton[disabled] {
pointer-events: none;
}

.button-wrapper.disabled {
cursor: not-allowed;
}

// ML bootstrap-select hacks that sit on top of Kibana hacks that often fight with KUI
// Should go away when EUI is fully adopted
.ui-select-match {
.btn-default[disabled],
.btn-default[disabled]:hover,
.btn-default[disabled]:focus {
background-color: $euiColorLightShade;
border-color: $euiColorLightShade;
opacity: 1;

.ui-select-placeholder {
color: $euiColorDarkShade;
}
}
}

.ui-select-container input[type="search"]::placeholder {
color: $euiColorDarkShade;
}

.ui-select-container input[type="search"]:focus {
box-shadow: none;
}

.ui-select-multiple.ui-select-bootstrap input.ui-select-search {
font-size: $euiFontSizeS;
padding: 5px 10px; // Matches current padding hacks from other parts of Kibana
}


// SASSTODO: Remove all the floats
.clear, .clearfix {
clear: both;
}
11 changes: 11 additions & 0 deletions x-pack/plugins/ml/public/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$mchColorCritical: #fe5050;
walterra marked this conversation as resolved.
Show resolved Hide resolved
$mchColorMajor: #fba740;
$mchColorMinor: #fdec25;
$mchColorWarning: #8bc8fb;
$mchColorUnknown: #c0c0c0;

$mchColorCriticalText: makeHighContrastColor($mchColorCritical, $euiColorEmptyShade);
$mchColorMajorText: makeHighContrastColor($mchColorMajor, $euiColorEmptyShade);
$mchColorMinorText: makeHighContrastColor($mchColorMinor, $euiColorEmptyShade);
$mchColorWarningText: makeHighContrastColor($mchColorWarning, $euiColorEmptyShade);
$mchColorUnknownText: $euiColorDarkShade;
1 change: 0 additions & 1 deletion x-pack/plugins/ml/public/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'ui-bootstrap';
import 'ui/persisted_log';
import 'ui/autoload/all';

import 'plugins/ml/styles/main.less';
import 'plugins/ml/access_denied';
import 'plugins/ml/factories/listener_factory';
import 'plugins/ml/factories/state_factory';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SASSTODO: This file has several direct EUI overwrites that need to be removed
.ml-anomalies-table {
.ml-icon-severity-critical,
.ml-icon-severity-major,
Expand All @@ -8,42 +9,43 @@
text-shadow: none;
}


// SASSTODO: Should only be three options, logic moved to the JS, where EuiIcon accepts a color
.ml-icon-severity-critical {
.euiIcon {
fill: #fe5050;
fill: $mchColorCriticalText;
}
}

.ml-icon-severity-major {
.euiIcon {
fill: #fba740;
fill: $mchColorMajorText;
}
}

.ml-icon-severity-minor {
.euiIcon {
fill: #fdec25;
fill: $mchColorMinorText;
}
}

.ml-icon-severity-warning {
.euiIcon {
fill: #8bc8fb;
fill: $mchColorWarningText;
}
}

.ml-icon-severity-unknown {
.euiIcon {
fill: #c0c0c0;
fill: $mchColorUnknownText;
}
}

tr th:first-child,
tr td:first-child {
width: 32px;
width: $euiSizeXL;
}

// SASSTODO: These need to be separate classes, not overrides
.euiTableCellContent {
.euiHealth {
font-size: inherit;
Expand All @@ -65,13 +67,13 @@
}

.detector-rules-icon {
margin-left: 3px;
margin-left: $euiSizeXS;
opacity: 0.5;
}
}

.euiContextMenuItem {
min-width: 150px
min-width: 150px;
}

.category-example {
Expand All @@ -84,7 +86,7 @@
}

.ml-anomalies-table-details {
padding: 4px 32px;
padding: $euiSizeXS $euiSizeXL;
max-height: 1000px;
overflow-y: auto;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'anomalies_table';
3 changes: 1 addition & 2 deletions x-pack/plugins/ml/public/components/anomalies_table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@


import './anomalies_table_directive';
import './anomalies_table_service.js';
import './styles/main.less';
import './anomalies_table_service.js';
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.ml-chart-tooltip {
position: absolute;
border: 2px solid #303030;
border: 2px solid $euiColorDarkestShade;
border-radius: 5px;
padding: 7px 5px;
color: #ffffff;
background-color: #303030;
font-family: Roboto, Droid, Helvetica Neue, Helvetica, Arial, sans-serif;
font-size: 12px;
color: $euiColorEmptyShade;
background-color: $euiColorDarkestShade;
font-family: $euiFontFamily;
font-size: $euiFontSizeXS;
opacity: 0;
display: none;
white-space: nowrap;
Expand All @@ -18,14 +18,10 @@
text-overflow: ellipsis;

hr {
margin-top: 3px;
margin-bottom: 3px;
margin-top: $euiSizeXS;
margin-bottom: $euiSizeXS;
border: none;
height: 1px;
background-color: #95a5a6;
}

.centered-text {
text-align: center;
background-color: $euiColorMediumShade;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'chart_tooltip';
3 changes: 1 addition & 2 deletions x-pack/plugins/ml/public/components/chart_tooltip/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@



import './chart_tooltip';
import './styles/main.less';
import './chart_tooltip';
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.confirm-modal {
padding: $euiSizeL;
cursor: auto;

// SASSTODO: Needs a proper selector
h3 {
margin-top: 0px;
}

.modal-title {
font-weight: $euiFontWeightBold;
padding-bottom: $euiSizeL;
}

.modal-body {
padding: 0px;
padding-bottom: $euiSizeL;
}

.modal-footer {
padding: 0px;
padding-top: $euiSizeL;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'confirm_modal';
1 change: 0 additions & 1 deletion x-pack/plugins/ml/public/components/confirm_modal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@

import './confirm_modal_service';
import './confirm_modal_controller';
import './styles/main.less';
24 changes: 0 additions & 24 deletions x-pack/plugins/ml/public/components/confirm_modal/styles/main.less

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.ml-table-controls {
label {
font-size: 12px;
padding: 0px 0px 5px 5px;
font-size: $euiFontSizeXS;
padding: 0px 0px $euiSizeXS $euiSizeXS;
}

.ml-table-controls-element {
display: inline-block;
padding-left: 15px;
padding-left: $euiSize;
}

select {
font-size: 13px;
font-size: $euiFontSizeXS;
font-style: normal;
}
}
3 changes: 3 additions & 0 deletions x-pack/plugins/ml/public/components/controls/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'controls';
@import 'controls_select/index';
@import 'select_severity/index';
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,31 @@ ml-controls-select {

.dropdown-menu {
min-width: 120px;
font-size: 13px;
}
font-size: $euiFontSizeXS;

.dropdown-menu > li > a {
color: #444444;
text-decoration: none;
}
> li > a {
color: $euiColorDarkestShade;;
text-decoration: none;

.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:active,
.dropdown-menu > li > a:focus {
color: #ffffff;
box-shadow: none;
&:hover, &:active, &:focus {
color: $euiColorEmptyShade;
box-shadow: none;
}
}
}

button.dropdown-toggle {
text-align: left;
margin-bottom: 3px;
margin-bottom: $euiSizeXS;

// SASSTODO: Needs more specific selectors
span {
font-size: 13px;
font-size: $euiSizeXS;
}
}

button.dropdown-toggle:hover,
button.dropdown-toggle:focus {
color: #444444;
color: $euiColorDarkestShade;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'controls_select';
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@



import './styles/main.less';
import './controls_select_directive.js';
Loading