Skip to content

Commit

Permalink
Merge branch 'master' into willopez-add-multi-select
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemurray authored Aug 19, 2019
2 parents 0e033e2 + 847d6ae commit c2708e8
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ ignore:
'npm:mem:20180117':
- libnpx > yargs > os-locale > mem:
reason: No update available
expires: '2019-09-15T21:34:43.636Z'
expires: '2019-09-16T00:24:48.037Z'
patch: {}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
"@reactioncommerce/components-context": "~1.2.0",
"commitlint": "^8.0.0",
"prop-types": "~15.6.2",
"react": "~16.8.6",
"react-dom": "~16.8.6"
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
"devDependencies": {
"@babel/cli": "~7.2.3",
Expand Down
2 changes: 1 addition & 1 deletion package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@
"@reactioncommerce/components-context": "~1.2.0",
"@material-ui/core": ">=4.3.2 < 5",
"prop-types": "~15.6.2",
"react-dom": "~16.8.6"
"react-dom": "~16.9.0"
}
}
4 changes: 4 additions & 0 deletions package/src/components/Button/Button.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### Overview

Buttons allow users to take an action such as add, save, cancel or delete. Buttons should clearly and simply communicate the action that will happen when they are pressed.

```jsx noeditor
<div style={{ marginBottom: "2rem", border: "1px solid #e6e6e6", padding: "1rem"}}>
<div style={{ display: "flex", flexWrap: "wrap", justifyContent: "space-evently", marginBottom: "1rem" }}>
Expand Down
3 changes: 3 additions & 0 deletions package/src/setupTests.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Add async/await features
import "regenerator-runtime/runtime";

// add some helpful assertions
import "@testing-library/jest-dom/extend-expect";

Expand Down
1 change: 0 additions & 1 deletion package/src/theme/defaultTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export const rawMuiTheme = {
},
action: {
hover: colors.reactionBlue100,
hoverOpacity: 1,
selected: colors.black10
}
},
Expand Down
28 changes: 23 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10141,14 +10141,15 @@ react-docgen@^4.1.0:
node-dir "^0.1.10"
recast "^0.17.3"

react-dom@~16.8.6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
react-dom@~16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.6"
scheduler "^0.15.0"

react-error-overlay@^5.1.0, react-error-overlay@^5.1.4:
version "5.1.6"
Expand Down Expand Up @@ -10262,7 +10263,7 @@ react-transition-group@^4.0.0:
loose-envify "^1.4.0"
prop-types "^15.6.2"

react@^16.0.0, react@~16.8.6:
react@^16.0.0:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
dependencies:
Expand All @@ -10271,6 +10272,15 @@ react@^16.0.0, react@~16.8.6:
prop-types "^15.6.2"
scheduler "^0.13.6"

react@~16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"

read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
Expand Down Expand Up @@ -10946,6 +10956,14 @@ scheduler@^0.13.6:
loose-envify "^1.1.0"
object-assign "^4.1.1"

scheduler@^0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

schema-utils@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
Expand Down

0 comments on commit c2708e8

Please sign in to comment.