Skip to content

Commit f84c7dc

Browse files
James TaltonJames Talton
James Talton
authored and
James Talton
committed
Merge with master
2 parents 91ab5de + a6fb601 commit f84c7dc

File tree

140 files changed

+5329
-2970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+5329
-2970
lines changed

‎.storybook/addons.js‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1-
import "core-js/es6/symbol";
2-
import "core-js/es6/object";
3-
import "core-js/es6/function";
4-
import "core-js/es6/parse-int";
5-
import "core-js/es6/parse-float";
6-
import "core-js/es6/number";
7-
import "core-js/es6/math";
8-
import "core-js/es6/string";
9-
import "core-js/es6/date";
10-
import "core-js/es6/array";
11-
import "core-js/es6/regexp";
12-
import "core-js/es6/map";
13-
import "core-js/es6/set";
14-
import "core-js/es6/reflect";
15-
16-
import "core-js/es7/reflect";
17-
import "zone.js/dist/zone";
1+
import "./polyfills.js";
182

193
import '@storybook/addon-storysource/register';
204
import "@storybook/addon-actions/register";
215
import "@storybook/addon-links/register";
6+
import '@storybook/addon-notes/register';
227
import "@storybook/addon-knobs/register";
238
import '@storybook/addon-options/register';

‎.storybook/config.js‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
import "core-js/es6/symbol";
2-
import "core-js/es6/object";
3-
import "core-js/es6/function";
4-
import "core-js/es6/parse-int";
5-
import "core-js/es6/parse-float";
6-
import "core-js/es6/number";
7-
import "core-js/es6/math";
8-
import "core-js/es6/string";
9-
import "core-js/es6/date";
10-
import "core-js/es6/array";
11-
import "core-js/es6/regexp";
12-
import "core-js/es6/map";
13-
import "core-js/es6/set";
14-
import "core-js/es6/reflect";
15-
16-
import "core-js/es7/reflect";
17-
import "zone.js/dist/zone";
1+
import "./polyfills.js";
182

193
import { configure, addDecorator } from "@storybook/angular";
204
import { withOptions } from '@storybook/addon-options';

‎.storybook/polyfills.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import "core-js/es";
2+
3+
import "zone.js/dist/zone";

‎.storybook/preview.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $feature-flags: (
44

55
@import '~carbon-components/scss/globals/scss/styles';
66

7-
.sb-show-main:not(.welcome) {
7+
.sb-show-main:not(.full-page) {
88
padding: 3em;
99
display: flex;
1010
flex-direction: column;

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
sudo: required
21
dist: trusty
32
language: node_js
43
node_js:

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cal-smith @zvonimirfras @magedhennawy @youda97
1+
* @cal-smith @zvonimirfras @youda97

‎karma-test-shim.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Error.stackTraceLimit = Infinity;
22

3-
require('core-js/es6');
4-
require('core-js/es7/reflect');
3+
require('core-js');
54

65
require('zone.js/dist/zone');
76
require('zone.js/dist/long-stack-trace-zone');

0 commit comments

Comments
 (0)