diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-08-03 14:31:32 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-08-08 16:25:34 +0200 |
| commit | f9b54901308bde3e1abeb0fa32d4a3f11648f603 (patch) | |
| tree | 2944c5bdb13ee163f2dfbfffc37c38ead61668d8 | |
| parent | 7ae25a0835a27cb9bf46ed64d6c59a1147110bee (diff) | |
| download | mullvadvpn-f9b54901308bde3e1abeb0fa32d4a3f11648f603.tar.xz mullvadvpn-f9b54901308bde3e1abeb0fa32d4a3f11648f603.zip | |
Upgrade reactxp@1.3.3
| -rw-r--r-- | app/components/Cell.js | 1 | ||||
| -rw-r--r-- | app/components/LoginStyles.js | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 48 |
4 files changed, 27 insertions, 25 deletions
diff --git a/app/components/Cell.js b/app/components/Cell.js index 2b3c06a3b1..80b783352f 100644 --- a/app/components/Cell.js +++ b/app/components/Cell.js @@ -19,6 +19,7 @@ const styles = { flexDirection: 'row', alignItems: 'center', alignContent: 'center', + cursor: 'default', }, cellHover: { backgroundColor: colors.blue80, diff --git a/app/components/LoginStyles.js b/app/components/LoginStyles.js index 3309fa2907..05fa0f29f9 100644 --- a/app/components/LoginStyles.js +++ b/app/components/LoginStyles.js @@ -95,6 +95,7 @@ export default { marginBottom: 0, flexDirection: 'row', backgroundColor: colors.white60, + cursor: 'default', }, account_dropdown__item_hover: { backgroundColor: colors.white40, diff --git a/package.json b/package.json index 084a96b0ca..5610fe987d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "react-redux": "^5.0.7", "react-router": "^4.3.1", "react-simple-maps": "^0.10.1", - "reactxp": "^1.3.0", + "reactxp": "^1.3.3", "redux": "^4.0.0", "redux-thunk": "^2.3.0", "uuid": "^3.0.1", @@ -372,7 +372,7 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert@1.4.1: +assert@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" dependencies: @@ -4912,10 +4912,6 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@4.17.10, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - lodash@^3.1.0, lodash@^3.10.1, lodash@^3.2.0, lodash@^3.3.1, lodash@^3.5.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -4928,6 +4924,10 @@ lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.3.0, lodash@^4.6.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + log-symbols@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -6054,13 +6054,6 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" - dependencies: - loose-envify "^1.3.1" - object-assign "^4.1.1" - prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" @@ -6077,6 +6070,13 @@ prop-types@^15.6.1: loose-envify "^1.3.1" object-assign "^4.1.1" +prop-types@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" + dependencies: + loose-envify "^1.3.1" + object-assign "^4.1.1" + ps-tree@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014" @@ -6375,20 +6375,20 @@ react@^16.0.0: object-assign "^4.1.1" prop-types "^15.6.0" -reactxp@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/reactxp/-/reactxp-1.3.0.tgz#ccb3859b7713ea0cb921fa3155c84f02b36b0f17" +reactxp@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/reactxp/-/reactxp-1.3.3.tgz#fc950b9c63d5f78d2207341514231330f86309f2" dependencies: "@types/lodash" "4.14.110" "@types/react" "16.0.36" "@types/react-dom" "16.0.6" "@types/react-native" "0.55.26" - assert "1.4.1" - lodash "4.17.10" - prop-types "15.6.2" - rebound "0.1.0" - subscribableevent "1.0.0" - synctasks "0.3.3" + assert "^1.4.1" + lodash "^4.17.10" + prop-types "^15.6.2" + rebound "^0.1.0" + subscribableevent "^1.0.0" + synctasks "^0.3.3" read-all-stream@^3.0.0: version "3.1.0" @@ -6545,7 +6545,7 @@ readline2@^1.0.1: is-fullwidth-code-point "^1.0.0" mute-stream "0.0.5" -rebound@0.1.0: +rebound@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/rebound/-/rebound-0.1.0.tgz#0638c61a93666bb515a58a03e1cfb34021e88b72" @@ -7400,7 +7400,7 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -subscribableevent@1.0.0: +subscribableevent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subscribableevent/-/subscribableevent-1.0.0.tgz#bde9500fa9009c7740c924109bac6119cd9898e6" dependencies: @@ -7456,7 +7456,7 @@ sync-exec@~0.6.x: version "0.6.2" resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105" -synctasks@0.3.3: +synctasks@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/synctasks/-/synctasks-0.3.3.tgz#1e3dde423b39d28bc940fdb7698d8b4b7a741e77" |
