Skip to content
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
7 changes: 3 additions & 4 deletions src/core_plugins/kibana/public/dashboard/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
@import 'panel/index';
@import 'viewport/index';

// Vis imports -- will have some duplicate styling
// because they will be imported via ui/public as well
// (without .theme-[] prefix)
@import 'src/ui/public/vis/map/index';
// Vis imports
@import 'src/ui/public/vis/index';
@import 'src/ui/public/vislib/index';
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@include euiScrollBar; /* 3 */
}

.visualization .vis-container {
.visualization .visChart__container {
overflow: visible; /* 2 */
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import 'ui/public/styles/styling_constants';

@import 'ui/public/query_bar/index';
// Public UI styles
@import 'ui/public/index';

// Context styles
@import './context/index';
Expand All @@ -16,6 +17,8 @@

// Visualize styles
@import './visualize/index';
// Has to come after visualize because of some
// bad cascading in the Editor layout
@import 'ui/public/vis/index';

// Management styles
Expand Down
4 changes: 2 additions & 2 deletions src/core_plugins/region_map/public/tooltip.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<table>
<tbody>
<tr ng-repeat="detail in details" >
<td class="tooltip-label"><b>{{detail.label}}</b></td>
<td class="tooltip-value">{{detail.value}}</td>
<td class="visTooltip__label"><b>{{detail.label}}</b></td>
<td class="visTooltip__value">{{detail.value}}</td>
</tr>
</tbody>
</table>
4 changes: 2 additions & 2 deletions src/core_plugins/tile_map/public/editors/_tooltip.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<table>
<tbody>
<tr ng-repeat="detail in details" >
<td class="tooltip-label">{{detail.label}}</td>
<td class="tooltip-value">{{detail.value}}</td>
<td class="visTooltip__label">{{detail.label}}</td>
<td class="visTooltip__value">{{detail.value}}</td>
</tr>
</tbody>
</table>
2 changes: 1 addition & 1 deletion src/fixtures/vislib/_vis_fixture.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const visHeight = $visCanvas.height();
$visCanvas.new = function () {
count += 1;
if (count > 1) $visCanvas.height(visHeight * count);
return $('<div>').addClass('visualize-chart').appendTo($visCanvas);
return $('<div>').addClass('visChart').appendTo($visCanvas);
};

afterEach(function () {
Expand Down
5 changes: 5 additions & 0 deletions src/ui/public/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import './query_bar/index';
// Can't import vis folder here because of cascading issues, it's imported in core_plugins/kibana
// @import './vis/index';
@import './vislib/index';
@import './visualize/index';
8 changes: 4 additions & 4 deletions src/ui/public/agg_response/hierarchical/_tooltip.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<table>
<table class="visTooltip__table">
<thead>
<tr class="tooltip-label">
<tr class="eui-textLeft visTooltip__label">
<th scope="col">field</th>
<th scope="col">value</th>
<th scope="col">{{metricCol.label}}</th>
</tr>
</thead>
<tbody>
<tr class="tooltip-value" ng-repeat="row in rows track by $index">
<tr class="visTooltip__value" ng-repeat="row in rows track by $index">
<td><span ng-bind-html="row.spacer"></span>{{row.field}}</td>
<td class="row-bucket">{{row.bucket}}</td>
<td>{{row.bucket}}</td>
<td>{{row.metric}}</td>
</tr>
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/agg_response/point_series/_tooltip.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<table>
<tbody>
<tr ng-repeat="detail in details" >
<td class="tooltip-label">{{detail.label}}</td>
<td class="tooltip-value">
<td class="visTooltip__label">{{detail.label}}</td>
<td class="visTooltip__value">
{{detail.value}}
<span ng-if="detail.percent"> ({{detail.percent}})</span>
</td>
Expand Down
4 changes: 0 additions & 4 deletions src/ui/public/styles/table.less
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,4 @@ table {
}
}
}

.slice {
stroke: #272727;
}
}
36 changes: 0 additions & 36 deletions src/ui/public/styles/variables/for-theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -193,32 +193,7 @@
@alert-color: @white;


// Truncate ====================================================================
@truncate-color: @body-bg;


// Typeahead ===================================================================
@typeahead-items-border: @globalColorLightGray;
@typeahead-items-color: @text-color;
@typeahead-items-bg: @body-bg;

@typeahead-item-color: @text-color;
@typeahead-item-border: @globalColorLightGray;
@typeahead-item-bg: @body-bg;
@typeahead-item-active-bg: @globalColorBlue;


// Alerts ======================================================================
@alert-vis-alert-color: @white;
@alert-vis-alert-border: @white;


// Legend ======================================================================
@legend-item-color: #666;

// Tooltip =====================================================================
@tooltip-space: 8px;
@tooltip-space-tight: @tooltip-space / 2;

@tooltip-bg: fadeout(darken(@globalColorBlue, 30%), 10%);
@tooltip-color: @globalColorWhite;
Expand All @@ -227,17 +202,6 @@
@tooltip-bold: 600;



// Svg =========================================================================
@svg-axis-color: #ddd;
@svg-tick-text-color: #848e96;
@svg-brush-color: @white;
@svg-endzone-bg: @black;

@vis-axis-title-color: #848e96;
@vis-chart-title-color: #848e96;


// Saved Object Finder =========================================================
@saved-object-finder-link-color: @link-color;
@saved-object-finder-icon-color: darken(@saved-object-finder-link-color, 10%);
Expand Down
5 changes: 3 additions & 2 deletions src/ui/public/vis/_index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import './editors/components/index';
@import './editors/default/index';
@import './components/index';
@import './editors/index';
@import './map/index';
@import './vis_types/index';
1 change: 1 addition & 0 deletions src/ui/public/vis/components/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import './tooltip/index';
1 change: 1 addition & 0 deletions src/ui/public/vis/components/tooltip/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import './tooltip';
66 changes: 66 additions & 0 deletions src/ui/public/vis/components/tooltip/_tooltip.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// EUITODO: Use EuiTooltip or create a tooltip mixin
.visTooltip,
.visTooltip__sizingClone {
@include euiBottomShadow($color: $euiColorFullShade);
@include euiFontSizeXS;
visibility: hidden;
pointer-events: none;
position: fixed;
z-index: $euiZLevel9;
background-color: tintOrShade($euiColorFullShade, 25%, 90%);
color: $euiColorGhost;
border-radius: $euiBorderRadius;
max-width: $euiSizeXL * 10;
overflow: hidden;
overflow-wrap: break-word;

> :last-child {
margin-bottom: $euiSizeS;
}

> * {
margin: $euiSizeS $euiSizeS 0;
}

table {
td,
th {
padding: $euiSizeXS;
}
}
}

.visTooltip__header {
margin: 0 0 $euiSizeS 0;
padding: $euiSizeXS $euiSizeS;
display: flex;
align-items: center;

&:last-child {
margin-bottom: 0;
}

+ * {
margin-top: $euiSizeS;
}
}

.visTooltip__headerIcon {
flex: 0 0 auto;
padding-right: $euiSizeS;
}

.visTooltip__headerText {
flex: 1 1 100%;
}

.visTooltip__label {
// max-width: $euiSizeXL * 3;
font-weight: $euiFontWeightMedium;
color: shade($euiColorGhost, 20%);
}

.visTooltip__sizingClone {
top: -500px;
left: -500px;
}
6 changes: 3 additions & 3 deletions src/ui/public/vis/components/tooltip/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export function Tooltip(id, el, formatter, events) {
this.order = 100; // higher ordered contents are rendered below the others
this.formatter = formatter;
this.events = events;
this.containerClass = 'vis-wrapper';
this.tooltipClass = 'vis-tooltip';
this.tooltipSizerClass = 'vis-tooltip-sizing-clone';
this.containerClass = 'visWrapper';
this.tooltipClass = 'visTooltip';
this.tooltipSizerClass = 'visTooltip__sizingClone';
this.showCondition = _.constant(true);

this.binder = new Binder();
Expand Down
2 changes: 2 additions & 0 deletions src/ui/public/vis/editors/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import './components/index';
@import './default/index';
2 changes: 1 addition & 1 deletion src/ui/public/vis/editors/default/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
flex: 1 1 100%;
}

.visualize-chart {
.visChart {
position: relative;
}
}
13 changes: 8 additions & 5 deletions src/ui/public/vis/map/_leaflet_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ $visMapLeafletSprite: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
min-height: 1px !important;
}

.leaflet-clickable {
&:hover {
stroke-width: $euiSizeS;
stroke-opacity: 0.8;
}
}

/**
* 1. Since Leaflet is an external library, we also have to provide EUI variables
* to non-override colors for darkmode.
Expand Down Expand Up @@ -56,7 +63,7 @@ $visMapLeafletSprite: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
padding: 0;
background: $temp-euiTooltipBackground;
color: $temp-euiTooltipText;
border-radius: $euiBorderRadius;
border-radius: $euiBorderRadius !important; // Override all positions the popup might be at
}

.leaflet-popup {
Expand All @@ -82,10 +89,6 @@ $visMapLeafletSprite: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
table {
td,th {
padding: $euiSizeXS;

&.row-bucket {
word-break: break-all;
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/ui/public/vis/vis_types/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import './vislib_vis_type';
@import './vislib_vis_legend';
Loading