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.

Sign up for GitHub

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

Jump to bottom

Vega vis needs to have visible fonts for dark theme dashboard #73675

Merged
merged 14 commits into from
Aug 17, 2020
Merged

Vega vis needs to have visible fonts for dark theme dashboard #73675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55c393a
Support dark theme in vega
VladLasitsa Jul 29, 2020
b3e59ad
Fixed tests
VladLasitsa Jul 30, 2020
b7a07af
Merge branch 'master' into #16456
elasticmachine Jul 30, 2020
660ef62
Merge branch 'master' into #16456
elasticmachine Aug 3, 2020
eba4a64
Merge branch 'master' into #16456
elasticmachine Aug 5, 2020
e4dd402
Fixed colors
VladLasitsa Aug 6, 2020
d07bb0c
Merge branch 'master' into #16456
VladLasitsa Aug 6, 2020
71e7f36
Fixed tests
VladLasitsa Aug 7, 2020
b4198a0
Merge branch 'master' into #16456
elasticmachine Aug 10, 2020
35f86f1
Fixed comment
VladLasitsa Aug 12, 2020
54d3654
Merge remote-tracking branch 'origin/#16456' into #16456
VladLasitsa Aug 12, 2020
8563299
Merge remote-tracking branch 'upstream/master' into #16456
VladLasitsa Aug 12, 2020
5b3ceda
Merge branch 'master' into #16456
elasticmachine Aug 15, 2020
1722595
Fixed colors
VladLasitsa Aug 15, 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
15 changes: 13 additions & 2 deletions src/plugins/vis_type_vega/public/data_model/vega_parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import _ from 'lodash';
import schemaParser from 'vega-schema-url-parser';
import versionCompare from 'compare-versions';
import hjson from 'hjson';
import { VISUALIZATION_COLORS } from '@elastic/eui';
// @ts-ignore
import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
VladLasitsa marked this conversation as resolved.
Show resolved Hide resolved
import { euiThemeVars } from '@kbn/ui-shared-deps/theme';
import { i18n } from '@kbn/i18n';
// @ts-ignore
import { vega, vegaLite } from '../lib/vega';
Expand All @@ -47,7 +49,7 @@ import {
} from './types';

// Set default single color to match other Kibana visualizations
const defaultColor: string = VISUALIZATION_COLORS[0];
const defaultColor: string = euiPaletteColorBlind()[0];

const locToDirMap: Record<string, ControlsLocation> = {
left: 'row-reverse',
Expand Down Expand Up @@ -654,6 +656,15 @@ export class VegaParser {
this._setDefaultValue(defaultColor, 'config', 'trail', 'fill');
}
}

// provide right colors for light and dark themes
this._setDefaultValue(euiThemeVars.euiTextColor, 'config', 'title', 'color');
this._setDefaultValue(euiThemeVars.euiTextColor, 'config', 'style', 'guide-label', 'fill');
this._setDefaultValue(euiThemeVars.euiTextColor, 'config', 'style', 'guide-title', 'fill');
this._setDefaultValue(euiThemeVars.euiTextColor, 'config', 'axis', 'tickColor');
this._setDefaultValue(euiThemeVars.euiTextColor, 'config', 'axis', 'domainColor');
this._setDefaultValue(euiThemeVars.euiColorDarkShade, 'config', 'axis', 'gridColor');
this._setDefaultValue('transparent', 'config', 'background');
VladLasitsa marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/vis_type_vega/public/vega_view/vega_base_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import moment from 'moment';
import dateMath from '@elastic/datemath';
import { vega, vegaLite } from '../lib/vega';
import { Utils } from '../data_model/utils';
import { VISUALIZATION_COLORS } from '@elastic/eui';
import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
import { i18n } from '@kbn/i18n';
import { TooltipHandler } from './vega_tooltip';
import { esFilters } from '../../../data/public';

import { getEnableExternalUrls } from '../services';

vega.scheme('elastic', VISUALIZATION_COLORS);
vega.scheme('elastic', euiPaletteColorBlind());

// Vega's extension functions are global. When called,
// we forward execution to the instance-specific handler
Expand Down