Skip to content

Commit 255a259

Browse files
authored
Merge pull request #498 from IBM/master
Update breaking-changes
2 parents 6fc8683 + 1639632 commit 255a259

Some content is hidden

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

44 files changed

+1467
-652
lines changed

.storybook/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ addDecorator(
2727
);
2828

2929
// load global styles
30-
require("!style-loader!css-loader!sass-loader!./preview.scss");
31-
require("!style-loader!css-loader!sass-loader!./preview-experimental.scss");
30+
require("!style-loader!css-loader!postcss-loader!sass-loader!./preview.scss");
31+
require("!style-loader!css-loader!postcss-loader!sass-loader!./preview-experimental.scss");
3232

3333
require("../src/index.stories");
3434
// automatically import all files ending in *.stories.ts

.travis.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,10 @@ before_script:
1515
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
1616
script: "npm run lint && npm test"
1717
deploy:
18-
-
19-
provider: script
20-
script: "bash ./scripts/deploy.sh"
21-
skip_cleanup: true
22-
true:
23-
branch: master
24-
-
25-
allow-empty-commit: true
26-
27-
github-token: $GH_TOKEN
28-
keep-history: true
29-
local-dir: pages
30-
name: carbon-bot
31-
provider: pages
32-
skip_cleanup: true
33-
true:
34-
branch: master
18+
provider: script
19+
script: "bash ./scripts/deploy.sh"
20+
skip_cleanup: true
21+
on:
22+
all_branches: true
3523
notifications:
3624
email: false

0 commit comments

Comments
 (0)