Skip to content

Commit

Permalink
EUI 13.0.0 (#41723)
Browse files Browse the repository at this point in the history
  • Loading branch information
snide authored Jul 23, 2019
1 parent 23b46f9 commit c2b926e
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 154 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"@babel/register": "7.4.4",
"@elastic/charts": "^7.2.1",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
Expand Down
7 changes: 3 additions & 4 deletions packages/kbn-ui-framework/doc_site/src/main.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@import '~@elastic/eui/src/themes/k6/k6_globals';
@import '~@elastic/eui/src/themes/k6/k6_colors_dark';
@import '~@elastic/eui/src/themes/eui/eui_colors_dark';
@import '~@elastic/eui/src/global_styling/functions/index';
@import '~@elastic/eui/src/global_styling/variables/index';
@import '~@elastic/eui/src/global_styling/mixins/index';
@import '~@elastic/eui/src/global_styling/reset/index';
@import "../../dist/kui_dark.css";
@import "./components/guide_components";
@import '../../dist/kui_dark.css';
@import './components/guide_components';
11 changes: 11 additions & 0 deletions src/dev/jest/setup/polyfills.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ const bluebird = require('bluebird');
bluebird.Promise.setScheduler(function (fn) { global.setImmediate.call(global, fn); });

const MutationObserver = require('mutation-observer');
// There's a bug in mutation-observer around the `attributes` option
// https://dom.spec.whatwg.org/#mutationobserver
// If either options's attributeOldValue or attributeFilter is present and options's attributes is omitted, then set options's attributes to true.
const _observe = MutationObserver.prototype.observe;
MutationObserver.prototype.observe = function observe(target, options) {
const needsAttributes = options.hasOwnProperty('attributeOldValue') || options.hasOwnProperty('attributeFilter');
if (needsAttributes && !options.hasOwnProperty('attributes')) {
options.attributes = true;
}
Function.prototype.call(_observe, this, target, options);
};
Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });

require('whatwg-fetch');
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

// @ts-ignore
import { euiColorAccent } from '@elastic/eui/dist/eui_theme_k6_light.json';
import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json';
import React, { Component, Fragment } from 'react';

import {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"react": "^16.8.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
11 changes: 11 additions & 0 deletions x-pack/dev-tools/jest/setup/polyfills.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,15 @@ const bluebird = require('bluebird');
bluebird.Promise.setScheduler(function (fn) { global.setImmediate.call(global, fn); });

const MutationObserver = require('mutation-observer');
// There's a bug in mutation-observer around the `attributes` option
// https://dom.spec.whatwg.org/#mutationobserver
// If either options's attributeOldValue or attributeFilter is present and options's attributes is omitted, then set options's attributes to true.
const _observe = MutationObserver.prototype.observe;
MutationObserver.prototype.observe = function observe(target, options) {
const needsAttributes = options.hasOwnProperty('attributeOldValue') || options.hasOwnProperty('attributeFilter');
if (needsAttributes && !options.hasOwnProperty('attributes')) {
options.attributes = true;
}
Function.prototype.call(_observe, this, target, options);
};
Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });
9 changes: 1 addition & 8 deletions x-pack/legacy/plugins/apm/public/style/global_overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Remove unnecessary space below the navigation dropdown
border-bottom: none;
}

/*
/*
Hide the "0-10 of 100" text in KUIPager component for all KUIControlledTable
*/
.kuiControlledTable .kuiPagerText {
Expand All @@ -32,10 +32,3 @@ Hide default dashed gridlines in EUI chart component for all APM graphs
stroke-opacity: 1;
stroke-dasharray: 1;
}

/*
Override tab size since K6 theme makes "s" and "m" tabs both 14px
*/
.k6Tab--large .euiTab {
font-size: 16px;
}
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/beats_management/public/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import * as euiVars from '@elastic/eui/dist/eui_theme_k6_light.json';
import * as euiVars from '@elastic/eui/dist/eui_theme_light.json';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { HashRouter } from 'react-router-dom';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
import euiVars from '@elastic/eui/dist/eui_theme_k6_light.json';
import euiVars from '@elastic/eui/dist/eui_theme_light.json';
import { i18n } from '@kbn/i18n';
import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
import 'brace/mode/yaml';
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"@babel/runtime": "7.4.5",
"@elastic/ctags-langserver": "^0.1.2",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "12.4.0",
"@elastic/eui": "13.0.0",
"@elastic/javascript-typescript-langserver": "^0.2.1",
"@elastic/lsp-extension": "^0.1.2",
"@elastic/node-crypto": "^1.0.0",
Expand Down
Loading

0 comments on commit c2b926e

Please sign in to comment.