Merge branch 'master' into stable

gitcoinco · Mar 5, 2019 · 8cf47d6 · 8cf47d6
2 parents fc77933 + cf9c4d2
commit 8cf47d6
Show file tree

Hide file tree

Showing 173 changed files with 3,035 additions and 510 deletions.
diff --git a/app/app/local.env b/app/app/local.env
@@ -10,6 +10,8 @@ REDIS_URL=rediscache://redis:6379/0?client_class=django_redis.client.DefaultClie
 CACHEOPS_REDIS=redis://redis:6379/0
 COLLECTFAST_CACHE_URL=dbcache://collectfast
 DATABASE_URL=psql://postgres:postgres@db:5432/postgres
+# If setting DATABASE_URL for local development server use following
+# DATABASE_URL=psql://gitcoin_user:password@localhost:5432/gitcoin
 DEBUG=on
 
 ################################################################################

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -302,6 +302,11 @@
     # admin views
     re_path(r'^_administration/?', admin.site.urls, name='admin'),
     path('_administration/email/grant_cancellation', retail.emails.grant_cancellation, name='admin_grant_cancellation'),
+    path(
+        '_administration/email/featured_funded_bounty',
+        retail.emails.featured_funded_bounty,
+        name='admin_featured_funded_bounty'
+    ),
     path(
         '_administration/email/subscription_terminated',
         retail.emails.subscription_terminated,
@@ -378,6 +383,11 @@
     path('_administration/email/gdpr_reconsent', retail.emails.gdpr_reconsent, name='gdpr_reconsent'),
     path('_administration/email/share_bounty', retail.emails.share_bounty, name='share_bounty'),
     path('_administration/email/new_tip/resend', retail.emails.resend_new_tip, name='resend_new_tip'),
+    path(
+        '_administration/email/day_email_campaign/<int:day>',
+        marketing.views.day_email_campaign,
+        name='day_email_campaign'
+    ),
     re_path(
         r'^_administration/process_accesscode_request/(.*)$',
         tdi.views.process_accesscode_request,

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -996,7 +996,7 @@ input.is-invalid {
   text-decoration: none;
   color: black;
   font-size: 0.9rem;
-  margin: 0 1rem;
+  margin: 0 0.5rem;
 }
 
 .metamask-links a:hover {

diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css
@@ -145,31 +145,30 @@ body {
   font-size: 14px;
 }
 
-.bounty-info {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.bounty-info > div {
-  margin-bottom: 4px;
-}
-
 .bounty-info div {
-  display: inline;
+  display: inline-block;
   margin-right: 15px;
-  font-weight: 300;
+  font-weight: 500;
 }
 
 .bounty-info-heading {
   color: #0D0764;
+  font-weight: 500;
 }
 
 .bounty-info-row-div {
   width: 100%;
 }
+
+.bounty-info-row-div i {
+  position: absolute;
+  top: 4px;
+}
+
 .bounty-info-row-span-left {
   float: left;
 }
+
 .bounty-info-row-span-right {
   float: right;
 }

diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css
@@ -82,7 +82,6 @@ h4,
   position: fixed;
   top: 0;
   left: 0;
-  /* right: 0; */
   z-index: -1;
   will-change: transform;
   overflow-y: hidden;
@@ -93,7 +92,6 @@ h4,
   background: url("/static/v2/images/header-bg.png") #0d023b;
   background-attachment: fixed;
   background-position: center 0;
-  background-size: 2000px;
 }
 
 .dropdown-toggle::after {
@@ -545,6 +543,22 @@ div.button-pink {
   width: 15px;
 }
 
+.g-fadein {
+  opacity: 0;
+}
+
+.g-fadein[data-fade-direction="left"] {
+  left: -5rem;
+}
+
+.g-fadein[data-fade-direction="mid"] {
+  bottom: -5em;
+}
+
+.g-fadein[data-fade-direction="right"] {
+  left: 5rem;
+}
+
 @media (max-width: 389.9px) {
 
   .footer__main {
@@ -559,6 +573,12 @@ div.button-pink {
   }
 }
 
+@media (max-width: 820px) {
+  .navbar-nav .nav_avatar {
+    display: none !important;
+  }
+}
+
 @media (min-width: 768px) and (max-width: 991.98px) {
 
   .navbar-brand #logo {
@@ -572,18 +592,30 @@ div.button-pink {
   }
 }
 
-@media (min-width: 768px) and (max-width: 1024px) {
+@media (min-width: 768px) and (max-width: 1240px) {
+  .navbar-expand-md .navbar-nav .nav-link,
+  .navbar-nav .btn-gc-blue.button--fund {
+    font-size: 0.8rem;
+  }
+
+  .nav-link__text {
+    display: none;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 1028px) {
 
   .nav-link {
     text-align: center;
   }
 
-  .nav-link__icon.hidden {
-    display: inline !important;
+  .navbar-expand-md .navbar-nav .nav-link,
+  .navbar-nav .btn-gc-blue.button--fund {
+    font-size: 0.7rem;
   }
 
-  .nav-link__text {
-    display: none;
+  .nav-link__icon.hidden {
+    display: inline !important;
   }
 
   .navbar-brand img {

diff --git a/app/assets/v2/css/grants/card.css b/app/assets/v2/css/grants/card.css
@@ -103,3 +103,11 @@
   background-color: white;
   border-radius: 50%
 }
+
+.grant-item__footer #CLR_banner {
+  font-size: 0.8rem;
+}
+
+.grant-item__footer #CLR_banner img {
+  margin-top: 6px;
+}
diff --git a/app/assets/v2/css/labs.css b/app/assets/v2/css/labs.css
@@ -6,10 +6,6 @@ body {
   flex-shrink: 0;
 }
 
-.navbar-nav > .img__spaceship {
-  display: none !important;
-}
-
 .lab-hero-bg {
   position: relative;
   align-content: center;

diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css
@@ -11,10 +11,6 @@ body {
   flex-shrink: 0;
 }
 
-.navbar-nav > .img__spaceship {
-  display: none !important;
-}
-
 .banner--green {
   background-color:#25E899;
   color: #000000;