Skip to content

Commit

Permalink
Merge branch 'staging' into greenkeeper/cypress-3.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
admrid authored Jul 4, 2019
2 parents 2889e9a + 68f23fc commit c4ba53b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"react-copy-to-clipboard": "5.0.1",
"react-dom": "16.8.6",
"react-ga": "2.5.7",
"react-redux": "7.0.3",
"react-redux": "7.1.0",
"react-router-dom": "5.0.0",
"react-scripts": "3.0.1",
"react-scrollchor": "6.0.0",
"react-tooltip": "3.10.0",
"redux": "4.0.1",
"redux-form": "8.2.1",
"redux-form": "8.2.3",
"redux-logger": "3.0.6",
"redux-thunk": "2.3.0",
"redux-watch": "1.1.1",
Expand All @@ -54,7 +54,7 @@
"eslint-plugin-cypress": "2.2.1",
"husky": "2.1.0",
"prettier": "1.18.0",
"pretty-quick": "1.11.0",
"pretty-quick": "1.11.1",
"wait-on": "3.2.0"
},
"resolutions": {
Expand Down
4 changes: 4 additions & 0 deletions src/components/dashboard/components/sideNav/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ export const SideNav = styled.nav`
`};
}
${media.desktopMin`
padding-top: 20px;
`}
&.opened {
${mediaopacity.handheld`opacity: .97`} width: 100%;
}
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@
dependencies:
regenerator-runtime "^0.13.2"

"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3":
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5":
version "7.4.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
Expand Down Expand Up @@ -8970,10 +8970,10 @@ pretty-format@^24.8.0:
ansi-styles "^3.2.0"
react-is "^16.8.4"

[email protected].0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.11.0.tgz#d0bf997f3eb7de3d1bac5ffeb9c335f404d844c8"
integrity sha512-hy0yOSnqVykrgoHcCcB72p3B5ERQJcjQI6ExeSGSTFE2cDrPwCQtFb3kXA1F+jUPrbt7orra8U+fjS/Emjgpuw==
[email protected].1:
version "1.11.1"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.11.1.tgz#462ffa2b93d24c05b7a0c3a001e08601a0c55ee4"
integrity sha512-kSXCkcETfak7EQXz6WOkCeCqpbC4GIzrN/vaneTGMP/fAtD8NerA9bPhCUqHAks1geo7biZNl5uEMPceeneLuA==
dependencies:
chalk "^2.3.0"
execa "^0.8.0"
Expand Down Expand Up @@ -9312,12 +9312,12 @@ react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

react-redux@7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.0.3.tgz#983c5a6de81cb1e696bd1c090ba826545f9170f1"
integrity sha512-vYZA7ftOYlDk3NetitsI7fLjryt/widNl1SLXYvFenIpm7vjb4ryK0EeFrgn62usg5fYkyIAWNUPKnwWPevKLg==
react-redux@7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.0.tgz#72af7cf490a74acdc516ea9c1dd80e25af9ea0b2"
integrity sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==
dependencies:
"@babel/runtime" "^7.4.3"
"@babel/runtime" "^7.4.5"
hoist-non-react-statics "^3.3.0"
invariant "^2.2.4"
loose-envify "^1.4.0"
Expand Down Expand Up @@ -9527,10 +9527,10 @@ [email protected]:
dependencies:
minimatch "3.0.4"

[email protected].1:
version "8.2.1"
resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.2.1.tgz#0fcadb5d5d697fbeba27de151acb9d9dd7c861f1"
integrity sha512-bqTsf9uqJPnJLGnYOuWaz18QkSVgAbGbBUves0Mg3+kaQYaiIByRkM73R7n80J+i41wUadOVFCJJkHR57JgC+w==
[email protected].3:
version "8.2.3"
resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.2.3.tgz#6156cddf15ad929cf70671607d3b980a81e94ec1"
integrity sha512-AHuhaAoG6bH6t9xfsZA6ZxK9M/QF0GN+AfoRaQzP5o+ZINIiCEUS3ThgAEDbZPvqwuem/WQdtoc0P9HcXvEelA==
dependencies:
"@babel/runtime" "^7.2.0"
es6-error "^4.1.1"
Expand Down

0 comments on commit c4ba53b

Please sign in to comment.