Skip to content

Commit

Permalink
update material-ui and update theme (#713)
Browse files Browse the repository at this point in the history
  • Loading branch information
mossjacob committed Aug 7, 2018
1 parent 77e09d6 commit 2d41d31
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 37 deletions.
8 changes: 5 additions & 3 deletions game_frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,17 @@
"standard": "^11.0.1"
},
"dependencies": {
"@material-ui/core": "^1.2.0",
"@material-ui/core": "^1.0.0",
"@material-ui/icons": "^2.0.1",
"@material-ui/lab": "^1.0.0-alpha.9",
"babel-core": "^6.26.0",
"babel-plugin-module-resolver": "^3.1.1",
"babel-preset-react-app": "^3.1.1",
"babel-runtime": "^6.23.0",
"parcel-bundler": "^1.9.2",
"react": "^16.2.0",
"react": "^16.3.0",
"react-ace": "^6.1.0",
"react-dom": "^16.2.0",
"react-dom": "^16.3.0",
"react-redux": "^5.0.7",
"react-unity-webgl": "^6.5.0",
"redux": "^3.7.2",
Expand Down
5 changes: 5 additions & 0 deletions game_frontend/src/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ const additionalVariables = {
}
}

const shape = {
borderRadius: '24px'
}

const theme = {
palette,
additionalVariables,
shape,
text: {
secondary: '#FFFFFF'
},
Expand Down
92 changes: 58 additions & 34 deletions game_frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,24 @@
esutils "^2.0.2"
js-tokens "^3.0.0"

"@babel/runtime@^7.0.0-beta.42":
version "7.0.0-beta.55"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.55.tgz#0bc33aa5a6ac0b012f37e25b9e6aaa2e489a916b"
"@babel/runtime@7.0.0-beta.42":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
dependencies:
core-js "^2.5.3"
regenerator-runtime "^0.11.1"

"@babel/runtime@7.0.0-beta.56":
version "7.0.0-beta.56"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.56.tgz#cda612dffd5b1719a7b8e91e3040bd6ae64de8b0"
dependencies:
core-js "^2.5.7"
regenerator-runtime "^0.12.0"

"@material-ui/core@^1.2.0":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-1.4.2.tgz#8a1282e985d4922a4d2b4f7e287d8a716a2fc108"
"@material-ui/core@^1.0.0":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-1.4.3.tgz#e6bc29b441c07932cc64fffb02670792b119fb8e"
dependencies:
"@babel/runtime" "^7.0.0-beta.42"
"@babel/runtime" "7.0.0-beta.42"
"@types/jss" "^9.5.3"
"@types/react-transition-group" "^2.0.8"
brcast "^3.0.1"
Expand All @@ -49,12 +55,23 @@
normalize-scroll-left "^0.1.2"
popper.js "^1.14.1"
prop-types "^15.6.0"
react-event-listener "^0.6.0"
react-event-listener "^0.6.2"
react-jss "^8.1.0"
react-transition-group "^2.2.1"
recompose "^0.27.0"
recompose "^0.28.0"
warning "^4.0.1"

"@material-ui/icons@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-2.0.1.tgz#1151cc66a3d41099de3ddaac33488e399d3425f0"
dependencies:
"@babel/runtime" "7.0.0-beta.42"
recompose "^0.28.0"

"@material-ui/lab@^1.0.0-alpha.9":
version "1.0.0-alpha.9"
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-1.0.0-alpha.9.tgz#a76da06cce4d2c3eefcea567afb6970c18237969"

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
Expand All @@ -77,16 +94,23 @@
version "10.5.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.4.tgz#6eccc158504357d1da91434d75e86acde94bb10b"

"@types/prop-types@*":
version "15.5.4"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.4.tgz#9e6199bad131786e24c2baa2a82705a02139fbf8"
dependencies:
"@types/react" "*"

"@types/react-transition-group@^2.0.8":
version "2.0.11"
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.11.tgz#feb274676a39383fffaa0dff710958d2251abefb"
version "2.0.13"
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.13.tgz#7769fb61eb71d64d087a713956f086a42c3ee171"
dependencies:
"@types/react" "*"

"@types/react@*":
version "16.4.7"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.7.tgz#f33f6d759a7e1833befa15224d68942d178a5a3f"
version "16.4.8"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.8.tgz#ff0440429783df0927bdcd430fa1225f7c08cf36"
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"

abab@^1.0.4:
Expand Down Expand Up @@ -1662,7 +1686,7 @@ core-js@^1.0.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"

core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
version "2.5.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"

Expand Down Expand Up @@ -5270,8 +5294,8 @@ pn@^1.1.0:
resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"

popper.js@^1.14.1:
version "1.14.3"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
version "1.14.4"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"

posix-character-classes@^0.1.0:
version "0.1.1"
Expand Down Expand Up @@ -5932,20 +5956,20 @@ react-dom@16.0.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react-dom@^16.2.0:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.1.tgz#7f8b0223b3a5fbe205116c56deb85de32685dad6"
react-dom@^16.3.0:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-event-listener@^0.6.0:
version "0.6.1"
resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.1.tgz#41c7a80a66b398c27dd511e22712b02f3d4eccca"
react-event-listener@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.2.tgz#df405e9578be052b77a76e4c3914686637caecff"
dependencies:
"@babel/runtime" "^7.0.0-beta.42"
"@babel/runtime" "7.0.0-beta.42"
prop-types "^15.6.0"
warning "^4.0.1"

Expand Down Expand Up @@ -6021,9 +6045,9 @@ react@16.0.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^16.2.0:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32"
react@^16.3.0:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down Expand Up @@ -6093,11 +6117,11 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"

recompose@^0.27.0:
version "0.27.1"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.1.tgz#1a49e931f183634516633bbb4f4edbfd3f38a7ba"
recompose@^0.28.0:
version "0.28.2"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.28.2.tgz#19e679227bdf979e0d31b73ffe7ae38c9194f4a7"
dependencies:
babel-runtime "^6.26.0"
"@babel/runtime" "7.0.0-beta.56"
change-emitter "^0.1.2"
fbjs "^0.8.1"
hoist-non-react-statics "^2.3.1"
Expand Down Expand Up @@ -6154,13 +6178,13 @@ regenerate@^1.2.1:
version "1.4.0"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"

regenerator-runtime@^0.11.0:
regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"

regenerator-runtime@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.0.tgz#8052ac952d85b10f3425192cd0c53f45cf65c6cb"
version "0.12.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"

regenerator-transform@^0.10.0:
version "0.10.1"
Expand Down

0 comments on commit 2d41d31

Please sign in to comment.