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

Timelion less to sass #23339

Merged
merged 35 commits into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8c741f3
added SASS versions
cchaos Aug 29, 2018
85da4e1
Wizard done
cchaos Aug 29, 2018
719fc76
Updating vis type images to use EuiIcons
cchaos Aug 30, 2018
ed444d1
Disabled lab vis done
cchaos Aug 30, 2018
3200a52
Moving selectors around and some re-naming
cchaos Aug 31, 2018
83c802d
Last bit of cleanup
cchaos Aug 31, 2018
2b57024
Merge remote-tracking branch '2_upstream/master' into vis-less-to-sass
cchaos Sep 4, 2018
31c91cc
Forgot to check pdf .css for selector name updates
cchaos Sep 4, 2018
8c8cc1f
Introduce legacyIcon
Sep 5, 2018
a10db74
fixing visualize -> .visualize
cchaos Sep 5, 2018
861b10c
Merge remote-tracking branch '2_upstream/master' into vis-less-to-sass
cchaos Sep 5, 2018
6ff0d6e
Merge pull request #1 from timroes/pr/22679
cchaos Sep 5, 2018
538c3d1
Updating styles for legacy icon vs EUI icon usage
cchaos Sep 5, 2018
8f145db
Merge remote-tracking branch '2_upstream/master' into vis-less-to-sass
cchaos Sep 5, 2018
5f16918
converted editors/components
cchaos Sep 6, 2018
70db682
Removed .visualization-options
cchaos Sep 6, 2018
e1bbfa4
Finished up sidebar
cchaos Sep 6, 2018
8d39f9c
Updated agg.html
cchaos Sep 6, 2018
b4cc106
Fixed filters agg section
cchaos Sep 6, 2018
eeac384
Finished up selector re-naming from vis/editors
cchaos Sep 6, 2018
e8ec806
Initial file swap
cchaos Sep 11, 2018
5f97cbb
Fixed up help & interval
cchaos Sep 12, 2018
ffff56e
Cleaned up suggestions
cchaos Sep 12, 2018
37029eb
Updated cells
cchaos Sep 12, 2018
063d330
Finished directives
cchaos Sep 12, 2018
a86799c
Finished vis
cchaos Sep 12, 2018
c72ede0
Final edits done
cchaos Sep 12, 2018
110ce13
Merge remote-tracking branch '2_upstream/master' into timelion-less-t…
cchaos Sep 19, 2018
0804145
Bad merge
cchaos Sep 19, 2018
a70a949
cleanup
cchaos Sep 19, 2018
8bef1e2
one more update
cchaos Sep 19, 2018
983f9ac
Merge remote-tracking branch '2_upstream/master' into timelion-less-t…
cchaos Sep 19, 2018
535cbdf
Importing TL vis styles via Kibana scss instead
cchaos Sep 19, 2018
6c5bfc7
Updating snaps and some selectors in functional test
cchaos Sep 20, 2018
3b0aa03
Remove extra spaces
cchaos Sep 20, 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
Empty file.
5 changes: 5 additions & 0 deletions src/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
@import './visualize/index';
@import 'ui/public/vis/index';

// Also import Timelion in case of embedding chart into dashboard
// SASSTODO: Remove once the pipeline imports all compiled CSS files always
@import '../../timelion/public/directives/index';
@import '../../timelion/public/vis/index';

// Dashboard styles
// MUST STAY AT THE BOTTOM BECAUSE OF DARK THEME IMPORTS
@import './dashboard/index';
1 change: 1 addition & 0 deletions src/core_plugins/timelion/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default function (kibana) {
description: 'Time series expressions for everything',
icon: 'plugins/timelion/icon.svg',
main: 'plugins/timelion/app',
styleSheetPath: `${__dirname}/public/index.scss`,
},
hacks: [
'plugins/timelion/lib/panel_registry',
Expand Down
17 changes: 17 additions & 0 deletions src/core_plugins/timelion/public/_app.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@


.timApp {
position: relative;

[ng-click] {
cursor: pointer;
}
}

.timApp__container {
margin: $euiSizeM;
}

.timApp__stats {
font-weight: $euiFontWeightRegular;
}
2 changes: 0 additions & 2 deletions src/core_plugins/timelion/public/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ require('plugins/timelion/directives/timelion_expression_input');
require('plugins/timelion/directives/timelion_help/timelion_help');
require('plugins/timelion/directives/timelion_interval/timelion_interval');

require('plugins/timelion/app.less');

document.title = 'Timelion - Kibana';

const app = require('ui/modules').get('apps/timelion', []);
Expand Down
210 changes: 0 additions & 210 deletions src/core_plugins/timelion/public/app.less

This file was deleted.

35 changes: 0 additions & 35 deletions src/core_plugins/timelion/public/chart.less

This file was deleted.

6 changes: 6 additions & 0 deletions src/core_plugins/timelion/public/directives/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import './timelion_expression_input';
@import './cells/index';
@import './chart/index';
@import './timelion_expression_suggestions/index';
@import './timelion_help/index';
@import './timelion_interval/index';
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* 1. Anchor suggestions beneath input.
* 2. Allow for option of positioning suggestions absolutely.
*/

.timExpressionInput__container {
flex: 1 1 auto;
display: flex;
flex-direction: column; /* 1 */
position: relative; /* 2 */
}

.timExpressionInput {
cursor: text !important;
min-height: $euiSizeXL * 2;
}
62 changes: 62 additions & 0 deletions src/core_plugins/timelion/public/directives/cells/_cells.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
.timCell {
display: inline-block;
cursor: pointer;
position: relative;
box-sizing: border-box;
border: 2px dashed transparent;
padding-left: 0px !important;
padding-right: 0px !important;
margin-bottom: $euiSizeM;

&.active {
border-color: $euiColorLightShade;
}
}

.timCell.running {
opacity: 0.50;
}


.timCell__actions {
position: absolute;
bottom: $euiSizeXS;
left: $euiSizeXS;

> .timCell__action,
> .timCell__id {
@include euiFontSizeXS;
font-weight: $euiFontWeightBold;
color: $euiColorMediumShade;
display: inline-block;
text-align: center;
width: $euiSizeL;
height: $euiSizeL;
line-height: $euiSizeL;
border-radius: $euiSizeL/2;
border: $euiBorderThin;
background-color: $euiColorLightestShade;
z-index: $euiZLevel1;
}

> .timCell__action {
opacity: 0;

&:focus {
opacity: 1;
}

&:hover,
&:focus {
color: $euiTextColor;
border-color: $euiColorMediumShade;
background-color: $euiColorLightShade;
}
}
}

.timCell:hover {
.timCell__action {
opacity: 1;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import './cells';
Loading