Skip to content

Commit

Permalink
Merge branch 'master' into joshblack-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Mar 5, 2020
2 parents b6ee81f + 2bfcf13 commit f030337
Show file tree
Hide file tree
Showing 10 changed files with 7,830 additions and 3,200 deletions.
2 changes: 1 addition & 1 deletion packages/colors/examples/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@babel/core": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"parcel-bundler": "^1.10.0-beta.1"
"parcel-bundler": "^1.12.4"
},
"dependencies": {
"react": "^16.6.3",
Expand Down
2,975 changes: 2,284 additions & 691 deletions packages/colors/examples/preview/yarn.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/components/src/globals/scss/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
@mixin tooltip--content($tooltip-type: 'icon') {
@include box-shadow;
width: max-content;
min-width: rem(24px);
max-width: rem(208px);
height: auto;
padding: if(
$tooltip-type == 'definition',
Expand Down
1 change: 1 addition & 0 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"lib",
"scss",
"svg",
"build-info.json",
"metadata.json"
],
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/examples/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"develop": "parcel index.html --no-cache"
},
"devDependencies": {
"parcel-bundler": "^1.10.0-beta.1"
"parcel-bundler": "^1.12.4"
}
}
3,424 changes: 2,268 additions & 1,156 deletions packages/layout/examples/preview/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/themes/examples/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"classnames": "^2.2.6",
"parcel-bundler": "^1.12.2",
"parcel-bundler": "^1.12.4",
"react": "^16.8.4",
"react-dom": "^16.8.4"
}
Expand Down
1,544 changes: 869 additions & 675 deletions packages/themes/examples/preview/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/type/examples/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@babel/core": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"parcel-bundler": "^1.10.0-beta.1"
"parcel-bundler": "^1.12.4"
},
"dependencies": {
"change-case": "^3.1.0",
Expand Down
3,076 changes: 2,402 additions & 674 deletions packages/type/examples/preview/yarn.lock

Large diffs are not rendered by default.

0 comments on commit f030337

Please sign in to comment.