Merge branch 'master' into kevin/metamask-fixes-2

app/app/urls.py

@@ -100,11 +100,7 @@
         dashboard.views.profile_job_opportunity,
         name='profile_job_opportunity'
     ),
-    url(
-        r'^api/v0.1/bountydocument',
-        dashboard.views.bounty_upload_nda,
-        name='bounty_upload_nda'
-    ),
+    url(r'^api/v0.1/bountydocument', dashboard.views.bounty_upload_nda, name='bounty_upload_nda'),
     url(r'^api/v0.1/faucet/save/?', faucet.views.save_faucet, name='save_faucet'),
     url(r'^api/v0.1/', include(dbrouter.urls)),
     url(r'^api/v0.1/', include(kdrouter.urls)),

app/assets/v2/css/leaderboard.css

@@ -1,16 +1,34 @@
-.leaderboard .key {
-  right: 0px;
-  display: block;
-  position: absolute;
-  margin-right: 10px;
-  margin-top: 5px;
+
+.interior .body.leaderboard-container {
+  background-color: #fff;
+}
+
+.leaderboard .card-body {
+  border-radius: 3px;
+}
+
+.leaderboard .podium-items {
+  background-color: #150069;
+}
+
+.key-title {
+  display: inline;
+}
+
+.key {
+  max-width: 12rem;
+  display: inline;
+}
+
+.table-hover tbody tr:hover {
+  background-color: whitesmoke;
 }
 
 .leaderboard .podium {
   border-bottom-left-radius: 2px;
   border-bottom-right-radius: 2px;
   background: #150069;
-  justify-content: space-around;
+  justify-content: space-evenly;
 }
 
 .leaderboard .winner {
@@ -28,35 +46,20 @@
 }
 
 .leaderboard .winner img {
-  max-height: 50px;
-  display: flex;
-}
-
-.leaderboard .winner h6 {
-  font-size: 8px;
-  color: #2B75D2;
+  max-height: 10rem;
 }
 
 .leaderboard .leaderboard_entry img {
-  max-height: 50px;
+  max-height: 4rem;
   border-radius: 50%;
 }
 
-thead {
-  color: #CECFD1;
-}
-
-tbody {
-  color: #5C5D5F;
-  font-size: 0.8rem;
-}
-
 tbody, a {
   color: #5C5D5F
 }
 
 .leaderboard .winner a {
-  color: #2B75D2;
+  color: #fff;
 }
 
 .leaderboard .leaderboard_entry {
@@ -68,22 +71,10 @@ tbody, a {
   display: none;
 }
 
-.leaderboard h3 {
-  font-size: .85rem;
-}
-
-.tableheaders {
-  font-size: 0.7rem;
-}
-
 .hidemobile {
   visibility: hidden;
 }
 
-.leaderboard .winner img:hover {
-  opacity: 0.55;
-}
-
 @media (min-width: 700px) {
   .item-count-bounties {
     display: block
@@ -109,59 +100,14 @@ tbody, a {
     width: 100%;
   }
 
-  .leaderboard .winner h6 {
-    font-size: 0.5rem;
-  }
-
-  tbody {
-    font-size: 1rem ;
-  }
-
-  .leaderboard h3 {
-    font-size: 1.2rem ;
-  }
-
-  .tableheaders {
-    font-size: 0.9rem;
-  }
-
-  .hidemobile{
+  .hidemobile {
     visibility: visible;
   }
-  .leaderboard .winner img {
-    max-height: 120px;
-  }
 }
 
 @media (min-width: 1000px) {
   .leaderboard .leaderboard_entry {
     padding: 10px 0px;
     text-decoration: none;
   }
-
-  .leaderboard .leaderboard_entry img {
-    max-height: 70px;
-    border-radius: 50%;
-  }
-
-  .leaderboard .winner img {
-    max-height: 150px;
-  }
-
-  .leaderboard .winner h6 {
-    font-size: 1rem ;
-  }
-
-  tbody {
-    font-size: 1.5rem ;
-  }
-
-  .leaderboard h3 {
-    font-size: 1.75rem ;
-  }
-
-  .tableheaders {
-    font-size: 1rem;
-  }
-
-}
+}