Merge branch 'develop' into ui/create-wallet-security-warning

MyEtherWallet · Aug 13, 2018 · 9269435 · 9269435 · mew-bot · Aug 13, 2018
2 parents ea56749 + 22ff708
commit 9269435
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
     "selenium-server": "^3.13.0",
     "semver": "^5.3.0",
     "shelljs": "^0.8.2",
-    "style-loader": "^0.21.0",
+    "style-loader": "^0.22.1",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^1.0.1",
     "uuid": "^3.3.2",

diff --git a/src/containers/FooterContainer/FooterContainer.scss b/src/containers/FooterContainer/FooterContainer.scss
@@ -174,6 +174,7 @@ a:active {
     p {
       color: $text--footer-link-color;
     }
+
     span {
       color: $white;
     }

diff --git a/src/layouts/InterfaceLayout/containers/VerifyMessageContainer/VerifyMessageContainer.scss b/src/layouts/InterfaceLayout/containers/VerifyMessageContainer/VerifyMessageContainer.scss
@@ -99,6 +99,7 @@
     }
   } // .send-form
 
+
   .send-form-small-top-margin {
     padding-top: 10px;
   }