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

Migrate and cleanup legacy scss #69369

Merged
merged 42 commits into from
Jul 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
191478f
Cleanup legacy scss, remove angular_ui_select.js since no longer used
kertal Jun 17, 2020
406fee2
restore angular_ui_select.js
kertal Jun 17, 2020
63fffcf
Merge branch 'master' into kertal-2020-06-17-cleanup-legacy-styles
elasticmachine Jun 17, 2020
e49d036
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jun 23, 2020
bc7110d
Further cleanup and no longer break build
kertal Jun 23, 2020
743c7a5
Cleanup and merge scss files
kertal Jun 23, 2020
fb65fd6
Merge branch 'kertal-2020-06-17-cleanup-legacy-styles' of github.com:…
kertal Jun 23, 2020
6616bdd
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 2, 2020
c52a38c
Cleanup styles and move to kibana_legacy
kertal Jul 2, 2020
d9bc0b5
Adapt mocks.ts
kertal Jul 2, 2020
afc86d9
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 6, 2020
390b937
Migrate even more SCSS
kertal Jul 6, 2020
32572d9
Add Karma mock for loadStyles
kertal Jul 6, 2020
d498031
Undo mixin extraction
kertal Jul 7, 2020
3371fba
Merge branch 'master' into kertal-2020-06-17-cleanup-legacy-styles
elasticmachine Jul 7, 2020
66b9ee7
Adapt canvas code
kertal Jul 8, 2020
366959a
Merge branch 'kertal-2020-06-17-cleanup-legacy-styles' of github.com:…
kertal Jul 8, 2020
8acbb82
Adapt management code
kertal Jul 8, 2020
0ac9443
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 9, 2020
020e217
Add kibanaLegacy to security
kertal Jul 9, 2020
5270c6a
Merge master
kertal Jul 14, 2020
cb3e7a9
Remove CSS transform
kertal Jul 14, 2020
120385c
Undo security app modifications
kertal Jul 14, 2020
75a0a70
Remove unnecessary import
kertal Jul 14, 2020
750c717
Add missing p to aginate so it's paginate again
kertal Jul 15, 2020
988e4be
Remove uiSelect classes from ML _hacks.scss
kertal Jul 15, 2020
1ac2518
Merge master /fix conflicts
kertal Jul 15, 2020
f0676bd
Move base styles to src/core/public/styles
kertal Jul 16, 2020
cc714b1
Undo canvas changes
kertal Jul 16, 2020
834bd5a
Undo graph changes
kertal Jul 16, 2020
9f7da91
Undo management changes
kertal Jul 16, 2020
021a3a3
Undo monitoring changes
kertal Jul 16, 2020
3879c40
Remove kibana_legacy dependency of canvas kibana.json
kertal Jul 16, 2020
4259724
Improve discover plugin code
kertal Jul 16, 2020
4d526b1
Undo ML change
kertal Jul 16, 2020
8bb8c90
Migrate utility classes
kertal Jul 16, 2020
6b3de46
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 16, 2020
fe7368e
Improve Discover styles
kertal Jul 16, 2020
8ceb8be
Remove loadStyles() since its no longer needed
kertal Jul 16, 2020
bbb07b1
Remove duplicates timelion files
kertal Jul 17, 2020
94a738b
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 17, 2020
7ff95d4
Merge remote-tracking branch 'upstream/master' into kertal-2020-06-17…
kertal Jul 20, 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
3 changes: 1 addition & 2 deletions src/core/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
@import './chrome/index';
@import './overlays/index';
@import './rendering/index';
@import './styles/index';

// Global styles need to be migrated
@import '../../legacy/ui/public/styles/_legacy/_index';
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import '@elastic/eui/src/components/call_out/variables';
@import '@elastic/eui/src/components/call_out/mixins';

// SASSTODO: Replace with an EUI editor
// Intentionally not using the EuiCodeBlock colors here because they actually change
// hue from light to dark theme. So some colors would change while others wouldn't.
Expand Down Expand Up @@ -181,7 +178,7 @@
}

&.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px $euiColorEmptyShade;
box-shadow: 0 0 3px 0 $euiColorEmptyShade;
}

.ace_marker-layer .ace_step {
Expand Down
58 changes: 58 additions & 0 deletions src/core/public/styles/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
@import '@elastic/eui/src/components/collapsible_nav/variables';
// Application Layout

// chrome-context
// TODO #64541
// Delete this block
.chrHeaderWrapper:not(.headerWrapper) .content {
display: flex;
flex-flow: row nowrap;
width: 100%;
height: 100%;
overflow: hidden;
}

.application,
.app-container {
> * {
position: relative;
}
}

.application {
position: relative;
z-index: 0;
display: flex;
flex-grow: 1;
flex-shrink: 0;
flex-basis: auto;
flex-direction: column;

> * {
flex-shrink: 0;
}
}

// We apply brute force focus states to anything not coming from Eui
// which has focus states designed at the component level.
// You can also use "kbn-resetFocusState" to not apply the default focus
// state. This is useful when you've already hand crafted your own
// focus states in Kibana.
:focus {
&:not([class^='eui']):not(.kbn-resetFocusState) {
@include euiFocusRing;
}
}

// A necessary hack so that the above focus policy doesn't pollute some EUI
// entrenched inputs.
.euiComboBox {
// :not() specificity needed to override the above
input:not([class^='eui']):focus {
animation: none !important;
}
}

.euiBody--collapsibleNavIsDocked .euiBottomBar {
margin-left: $euiCollapsibleNavWidth;
}
2 changes: 2 additions & 0 deletions src/core/public/styles/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import './base';
@import './ace_overrides';
3 changes: 0 additions & 3 deletions src/legacy/ui/public/_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Legacy styles to come before all
@import './styles/_legacy/index';

// Prefix all styles with "kbn" to avoid conflicts.
// Examples
// kbnChart
Expand Down
153 changes: 0 additions & 153 deletions src/legacy/ui/public/styles/_legacy/_base.scss

This file was deleted.

7 changes: 0 additions & 7 deletions src/legacy/ui/public/styles/_legacy/_index.scss

This file was deleted.

11 changes: 0 additions & 11 deletions src/legacy/ui/public/styles/_legacy/components/_config.scss

This file was deleted.

67 changes: 0 additions & 67 deletions src/legacy/ui/public/styles/_legacy/components/_control_group.scss

This file was deleted.

59 changes: 0 additions & 59 deletions src/legacy/ui/public/styles/_legacy/components/_hintbox.scss

This file was deleted.

Loading