diff --git a/package-lock.json b/package-lock.json index 146a1ba..462d1ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -861,7 +861,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.4.1", + "follow-redirects": "1.5.0", "is-buffer": "1.1.6" } }, @@ -5317,9 +5317,9 @@ } }, "follow-redirects": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", - "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", + "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { "debug": "3.1.0" } @@ -16869,6 +16869,11 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" }, + "what-input": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.1.0.tgz", + "integrity": "sha512-8Z/3D2ASERofi3YeWmcd7gjU2rg4lP4lMbXa6Kxb9R7l076tnmA7+lhhXCDpQ3R+X+lK3c8R8UuTG+YoJm7wGA==" + }, "whatwg-encoding": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", diff --git a/package.json b/package.json index 42a6ffe..3a29601 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,8 @@ "redux": "^3.7.2", "redux-form": "^7.2.3", "redux-thunk": "^2.2.0", - "rmwc": "0.0.1-rc13" + "rmwc": "0.0.1-rc13", + "what-input": "^5.1.0" }, "jest": { "transform": { diff --git a/src/app/components/AccountInfo/AccountInfoAmounts/AccountInfoAmounts.css b/src/app/components/AccountInfo/AccountInfoAmounts/AccountInfoAmounts.css index 9d605e8..89787bf 100644 --- a/src/app/components/AccountInfo/AccountInfoAmounts/AccountInfoAmounts.css +++ b/src/app/components/AccountInfo/AccountInfoAmounts/AccountInfoAmounts.css @@ -29,13 +29,34 @@ color: #36b149; padding: 4px 10px; border-radius: 50px; + cursor: default; } - .accountInfoRefreshButton { font-size: 1.2rem; border: none; color: #585858; position: absolute; cursor: pointer; + background-color: white; + + transition: all 0.2s ease; + opacity: 1; +} + +.accountInfoRefreshButton:link, +.accountInfoRefreshButton:visited { + color: #585858; +} + +.accountInfoRefreshButton:hover { + opacity: 0.5; +} + +.accountInfoRefreshButton:active { + opacity: 1; + color: #585858; + -webkit-transform: scale(0.8); + -ms-transform: scale(0.8); + transform: scale(0.8); } diff --git a/src/app/components/AccountInfo/AccountInfoHeader/AccountInfoHeader.css b/src/app/components/AccountInfo/AccountInfoHeader/AccountInfoHeader.css index ca71cf8..d94d534 100644 --- a/src/app/components/AccountInfo/AccountInfoHeader/AccountInfoHeader.css +++ b/src/app/components/AccountInfo/AccountInfoHeader/AccountInfoHeader.css @@ -44,6 +44,22 @@ cursor: pointer; color: #585858; font-size: 1.1rem; + transition:all 0.2s ease; +} + +.accountDropDownButton:link, +.accountDropDownButton:visited { + color: #585858; +} + +.accountDropDownButton:hover { + opacity: 0.5; +} + +.accountDropDownButton:active { + opacity: 1; + color: #585858; + font-size: 0.8rem; } .accountInfoDropDown { diff --git a/src/app/components/MainNav/MainNav.css b/src/app/components/MainNav/MainNav.css index 81ea23d..9f07f68 100644 --- a/src/app/components/MainNav/MainNav.css +++ b/src/app/components/MainNav/MainNav.css @@ -4,6 +4,18 @@ height: 100%; border: none; cursor: pointer; + transition:all 0.2s ease; +} + +.mainNavButton:hover { + opacity: 0.6; +} + +.mainNavButton:active { + opacity: 1; + -webkit-transform: scale(0.8); + -ms-transform: scale(0.8); + transform: scale(0.8); } .mainNavButton svg { diff --git a/src/app/components/MainNav/MainNav.js b/src/app/components/MainNav/MainNav.js index 20bc8af..2f00645 100644 --- a/src/app/components/MainNav/MainNav.js +++ b/src/app/components/MainNav/MainNav.js @@ -37,7 +37,7 @@ class MainNav extends Component { const navigationMarkup = this.generateNavigationMarkup() return ( -