Merge branch 'eyeballs' of github.com:MetaMask/metamask-plugin into eyeballs

2 files changed, 25 insertions, 3 deletions

diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 59577f76c..9dbfb6518 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -28,18 +28,18 @@ html, body {
 }
 
 button {
+  font-family: 'Transat Black';
   outline: none;
   cursor: pointer;
   margin: 10px;
-  padding: 6px;
+  padding: 8px 12px;
   border: none;
-  border-radius: 3px;
   background: #F7861C;
-  font-weight: 500;
   color: white;
   transform-origin: center center;
   transition: transform 50ms ease-in;
 }
+
 button:hover {
   transform: scale(1.1);
 }
diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css
index 6223a8c06..14ef272ad 100644
--- a/ui/app/css/lib.css
+++ b/ui/app/css/lib.css
@@ -1,3 +1,13 @@
+/* color */
+
+.color-orange {
+  color: #F7861C;
+}
+
+.color-forest {
+  color: #08525D; 
+}
+
 /* lib */
 
 .full-width {
@@ -47,6 +57,10 @@
   flex: none;
 }
 
+.flex-basis-auto {
+  flex-basis: auto;
+}
+
 .flex-grow {
   flex: 1 1 auto;
 }
@@ -105,6 +119,10 @@
   transform: scale(0.95);
 }
 
+.cursor-disabled {
+  cursor: not-allowed;
+}
+
 .margin-bottom-sml {
   margin-bottom: 20px;
 }
@@ -125,6 +143,10 @@
   font-size: 12px;
 }
 
+.font-medium {
+  font-size: 1.2em;
+}
+
 /* Send Screen */
 .send-screen {
   margin: 0 20px;