Skip to content

Commit

Permalink
Merge pull request #3573 from weaveworks/update-materialize-css
Browse files Browse the repository at this point in the history
fix: update materialize-css to update jquery
  • Loading branch information
guyfedwards authored Feb 26, 2019
2 parents 021c1ae + f645d11 commit 561a7c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"json-stable-stringify": "1.0.1",
"lcp": "1.1.0",
"lodash": "4.17.11",
"materialize-css": "0.98.1",
"materialize-css": "0.100.2",
"moment": "2.21.0",
"page": "1.7.1",
"prop-types": "15.6.0",
Expand Down
29 changes: 12 additions & 17 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3644,9 +3644,10 @@ growly@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"

hammerjs@^2.0.4:
hammerjs@^2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=

handlebars@^4.0.3:
version "4.0.11"
Expand Down Expand Up @@ -4730,9 +4731,10 @@ jest@21.2.1:
dependencies:
jest-cli "^21.2.1"

jquery@^2.1.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
"jquery@^3.0.0 || ^2.1.4":
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==

js-base64@^2.1.8, js-base64@^2.1.9:
version "2.3.2"
Expand Down Expand Up @@ -5182,13 +5184,13 @@ markdown-table@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"

materialize-css@0.98.1:
version "0.98.1"
resolved "https://registry.yarnpkg.com/materialize-css/-/materialize-css-0.98.1.tgz#7276895b2c998b53e26deaa0c23a0484c0851d99"
materialize-css@0.100.2:
version "0.100.2"
resolved "https://registry.yarnpkg.com/materialize-css/-/materialize-css-0.100.2.tgz#9ca32b24904c9a04491fc7d0a2e9402e7b1dae07"
integrity sha512-Bf4YeoJCIdk4dlpnmVX+DIOJBbqOKwfBPD+tT5bxwXNFMLk649CGbldqtnctkkfMp+fGgSAsdYu9lo1ZolZqgA==
dependencies:
hammerjs "^2.0.4"
jquery "^2.1.4"
node-archiver "^0.3.0"
hammerjs "^2.0.8"
jquery "^3.0.0 || ^2.1.4"

math-expression-evaluator@^1.2.14:
version "1.2.17"
Expand Down Expand Up @@ -5481,13 +5483,6 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"

node-archiver@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/node-archiver/-/node-archiver-0.3.0.tgz#b9f1afe5006d0bdf29260181833a070978bc6947"
dependencies:
fstream "^1.0.10"
tar "^2.2.1"

node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
Expand Down

0 comments on commit 561a7c4

Please sign in to comment.