Merge branch 'ft-twitter_verification'

* ft-twitter_verification: Renamed label Added powered by mycrypto logo Added Powered By MyCrypto logo Removed TIP banner Added logic to handle Twitter badges
409H · Jun 13, 2018 · 52aaa90 · 52aaa90
2 parents ef59a78 + ae9aa9a
commit 52aaa90
Show file tree

Hide file tree

Showing 16 changed files with 999 additions and 223 deletions.
diff --git a/css/app.css b/css/app.css
diff --git a/css/app.css.map b/css/app.css.map
diff --git a/css/app.scss b/css/app.scss
@@ -37,9 +37,16 @@
     width: 300px;
 
     #content {
-        padding: 15px;
+        padding-top: 15px;
+        padding-left: 15px;
+        padding-right: 15px;
+        background: url(/images/powered-by-mycrypto.png);
+        background-size: 85%;
+        background-position: bottom;
+        background-repeat: no-repeat;
 
         #footer {
+            padding-top: 4em;
             font-size: 70%;
         }
     }
@@ -102,6 +109,11 @@
     margin-bottom: -0.2em;
 }
 
+#ext-etheraddresslookup-choose_blockchain {
+    margin-top:0;
+    margin-bottom:0;
+}
+
 /*Labels*/
 @media print {
     .ext-etheraddresslookup-label {

diff --git a/css/settings.css b/css/settings.css
diff --git a/css/settings.css.map b/css/settings.css.map
diff --git a/images/powered-by-mycrypto.png b/images/powered-by-mycrypto.png
diff --git a/images/twitter/blacklisted.png b/images/twitter/blacklisted.png
diff --git a/images/twitter/neutral.png b/images/twitter/neutral.png
diff --git a/images/twitter/whitelisted.png b/images/twitter/whitelisted.png