Merge pull request #9 from Daniel-Wang/daniel/improveLanding

Add some css changes to landing page
Daniel-Wang · Nov 21, 2017 · 2921115 · 2921115
2 parents 13ef799 + cfb7e62
commit 2921115
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -12,13 +12,13 @@ Each of these is probably a huge PR
 
 - [x] Port over changes from Coindex (HackHarvard)
 - [x] Fix duplicate address bug
-- [] Implement TODOs already mentioned
-- [] Logout redirect
+- [x] Implement TODOs already mentioned
+- [x] Logout redirect
 - [] Major UI improvements
-  - [] Colors
-  - [] Logo
+  - [x] Colors
+  - [x] Logo
   - [] Coin logos
-  - [] Dialog
+  - [x] Dialog
   - [] Animations? (After Effects on buttons that animate into a check mark)
 - [] Include price data for :
   - [] Bitcoin cash
@@ -27,7 +27,7 @@ Each of these is probably a huge PR
   - [] Monero
   - [] Zcash
   - [] Ripple
--[] Include currency exchange for:
+- [] Include currency exchange for:
   - [] EUR
   - [] JPY
   - [] GBP
@@ -37,4 +37,4 @@ Each of these is probably a huge PR
   - [] NZD
   - [] ZAR
   - [] CNY
-- [] Manually enter number of coins
+- [x] Manually enter number of coins
diff --git a/public/style/app.css b/public/style/app.css
@@ -20,25 +20,21 @@ body {
   flex-direction: column;
 }
 
-h1{
-  padding: none;
-  margin: none;
-}
-
 a{
   color: white;
   text-decoration: none;
 }
 
 .signin {
-  margin-top: 10px;
-  padding: 10px;
+  margin-top: 50px;
+  padding: 18px;
+  padding-left: 32px;
+  padding-right: 32px;
   border: 0;
-  background: #FFF;
-  opacity: 0.7;
   border-radius: 5px;
-  color: #000;
-  font-weight: bolder;
+  font-size: 24px;
+  background: #FFF;
+  color: #547AA5;
 }
 
 .login {
@@ -47,6 +43,10 @@ a{
   background-color: #547AA5;
 }
 
+h2 {
+  font-weight: normal;
+}
+
 .header{
   display: flex;
   flex-direction: row;
@@ -55,16 +55,18 @@ a{
   padding: 20px;
 }
 
-.header h1{
-  padding: 0px 20px 0px 20px;
-  color: white;
-}
-
 .logo{
   width: 100px;
   height: 100px;
   background-size: cover;
   background-image: url("/style/logo.png");
+  margin-bottom: 22px;
+}
+
+.header-title {
+  font-size: 84px;
+  padding-left: 20px;
+  font-weight: normal;
 }
 
 .column {
@@ -103,6 +105,7 @@ a{
 
 .sidebar-header {
   font-size: 50px;
+  font-weight: normal;
 }
 
 .sidebar-logout {

diff --git a/views/index.ejs b/views/index.ejs
@@ -7,13 +7,13 @@
 </head>
 
 <body>
-  <div class="login">
+  <div class="login content">
     <div class="header">
       <div class="logo"></div>
-      <h1>Coindex</h1>
+      <h1 class="header-title">Coindex</h1>
     </div>
-    <div class=content>
-      <h2>A Decentralized Cryptocurrency Portolio Manager</h2>
+    <div class="content">
+      <h2>The Most Featureful Decentralized Cryptocurrency Portolio Manager</h2>
       <button class="signin" id="signin-button">
         Log in with Blockstack
       </button>

diff --git a/views/partials/sidebar.ejs b/views/partials/sidebar.ejs
@@ -1,6 +1,7 @@
 <div class="sidebar">
-  <div>
-    <h1><a href="/dashboard" class="sidebar-content">Coindex</a></h1>
+  <div class="header">
+    <a href="/dashboard"><div class="logo"></div></a>
+    <h1 class="sidebar-header"><a href="/dashboard" class="sidebar-content">Coindex</a></h1>
   </div>
 
   <div>