Merge branch 'hackathon-font-color' of github.com:gitcoinco/web into …

…hackathon-font-color

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Create a report to help us improve
 
 ---

.github/ISSUE_TEMPLATE/custom.md

@@ -1,5 +1,5 @@
 ---
-name: Custom
+name: 🤔 Custom
 about: Want to report an issue that doesn't fall under any other category? Use this
   template.
 

.github/ISSUE_TEMPLATE/discussion.md

@@ -1,5 +1,5 @@
 ---
-name: Discussion
+name: ❓Discussion
 about: Want to start a discussion? Use this template.
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: ✋ Feature request
 about: Suggest an idea for this project
 
 ---

.github/ISSUE_TEMPLATE/thank_you.md

@@ -0,0 +1,21 @@
+---
+name: ❤️ Say thank you
+about: Tell us how you use nock & support our efforts towards our mission (Grow/Sustain Open Source)
+---
+
+# ❤️ I'm using Gitcoin
+
+If you (or your company) are using Gitcoin - please let us know. We'd love to hear from you!
+
+If you would like to help Gitcoin - any of the following is greatly appreciated.
+
+- [ ] Give the repository a star ⭐️
+- [ ] Help out with issues
+- [ ] Review pull requests
+- [ ] Blog about Gitcoin
+- [ ] Give talks
+- [ ] Do a bounty
+- [ ] Support us on [Gitcoin Grants](https://gitcoin.co/grants/86/gitcoin-sustainability-fund)
+
+Thank you!
+The Gitcoin team

app/app/tests/test_app_urls.py

@@ -89,15 +89,6 @@ def test_faucet_resolve(self):
         self.assertEqual(resolve('/faucet').view_name, 'faucet')
         self.assertEqual(resolve('/faucet/').view_name, 'faucet')
 
-    def test_dashboard_reverse(self):
-        """Test the dashboard url and check the reverse."""
-        self.assertEqual(reverse('dashboard'), '/dashboard')
-
-    def test_dashboard_resolve(self):
-        """Test the dashboard url and check the resolution."""
-        self.assertEqual(resolve('/dashboard').view_name, 'dashboard')
-        self.assertEqual(resolve('/dashboard/').view_name, 'dashboard')
-
     def test_explorer_reverse(self):
         """Test the explorer url and check the reverse."""
         self.assertEqual(reverse('explorer'), '/explorer')

app/app/urls.py

@@ -64,6 +64,9 @@
     # inbox
     path('inbox/', include('inbox.urls', namespace='inbox')),
 
+    # board
+    path('dashboard/', dashboard.views.board, name='dashboard'),
+
     # kudos
     path('kudos/', kudos.views.about, name='kudos_main'),
     path('kudos/about/', kudos.views.about, name='kudos_about'),
@@ -132,9 +135,21 @@
     re_path(r'^onboard/(?P<flow>\w+)/$', dashboard.views.onboard, name='onboard'),
     re_path(r'^onboard/contributor/avatar/?$', dashboard.views.onboard_avatar, name='onboard_avatar'),
     url(r'^postcomment/', dashboard.views.post_comment, name='post_comment'),
-    url(r'^dashboard/?', dashboard.views.dashboard, name='dashboard'),
     url(r'^explorer/?', dashboard.views.dashboard, name='explorer'),
 
+    # Funder dashboard
+    path('funder_dashboard/<str:bounty_type>/', dashboard.views.funder_dashboard, name='funder_dashboard'),
+    path(
+        'funder_dashboard/bounties/<int:bounty_id>/',
+        dashboard.views.funder_dashboard_bounty_info,
+        name='funder_dashboard_bounty_info'
+    ),
+
+    # Contributor dashboard
+    path(
+        'contributor_dashboard/<str:bounty_type>/', dashboard.views.contributor_dashboard, name='contributor_dashboard'
+    ),
+
     # Hackathon static page
     url(r'^hackathon/ethhack2019', dashboard.views.ethhack, name='ethhack_2019'),
     url(r'^hackathon/beyondblocks', dashboard.views.beyond_blocks_2019, name='beyond_blocks_2019'),

app/assets/v2/css/base.css

@@ -1581,3 +1581,7 @@ div.busyOverlay {
 .g-modal .modal-footer {
   border: none;
 }
+
+.inner-tooltip {
+  pointer-events: none;
+}

app/assets/v2/css/board.css

@@ -0,0 +1,95 @@
+.line-deco:after {
+  content: '';
+  position: absolute;
+  top: 4em;
+  border: 1px solid #F5F6F6;
+  bottom: 2em;
+  left: 2.25em;
+}
+
+.list-bounty {
+  max-height: 100vh;
+  overflow-y: auto;
+  padding: 0;
+  position: relative;
+  z-index: 1;
+  background: #fff no-repeat;
+  background-image: -webkit-radial-gradient(50% 0, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), -webkit-radial-gradient(50% 100%, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
+  background-image: -moz-radial-gradient(50% 0, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), -moz-radial-gradient(50% 100%, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
+  background-image: radial-gradient(farthest-side at 50% 0, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), radial-gradient(farthest-side at 50% 100%, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
+  background-position: 0 0, 0 100%;
+  background-size: 100% 14px;
+}
+
+.list-bounty:before,
+.list-bounty:after {
+  content: "";
+  position: relative;
+  z-index: -1;
+  display: block;
+  height: 30px;
+  margin: 0 0 -30px;
+  background: -webkit-linear-gradient(top, #fff, #fff 30%, rgba(255, 255, 255, 0));
+  background: -moz-linear-gradient(top, #fff, #fff 30%, rgba(255, 255, 255, 0));
+  background: linear-gradient(to bottom, #fff, #fff 30%, rgba(255, 255, 255, 0));
+}
+
+.list-bounty:after {
+  margin: -30px 0 0;
+  background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #fff 70%, #fff);
+  background: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #fff 70%, #fff);
+  background: linear-gradient(to bottom, rgba(255, 255, 255, 0), #fff 70%, #fff);
+}
+
+.list-bounty-item + .list-bounty-item {
+  border-top: 1px solid #dee2e6;
+}
+
+.comment-plan {
+  color: #666666;
+  white-space: pre-line;
+  max-height: 100px;
+  overflow: hidden;
+  overflow-y: auto;
+  background: #F5F6F6;
+  padding: 1em;
+  margin-top: 1em;
+  border-radius: 5px;
+}
+
+.head-number {
+  text-align: center;
+}
+.head-number_title {
+  font-size: 12px;
+  color: #666666;
+  letter-spacing: 1.5px;
+}
+
+.head-number_value {
+  color: var(--gc-purple);
+  font-weight: 700;
+  display: block;
+  font-size: 2rem;
+}
+
+.light-blue {
+  color: #008EFF;
+}
+
+.list-bounty-item_content {
+  width: 100%;
+}
+
+@media (min-width: 768px) {
+  .list-bounty-item_logo {
+    width: 40px;
+    height: 40px;
+  }
+}
+
+@media (min-width: 992px) {
+  .list-bounty-item_content {
+    width: 75%;
+  }
+}

app/assets/v2/css/featured-bounties.css

@@ -2,6 +2,36 @@
   color: #fff;
   background-color: #0d003c;
   padding: 0.7rem 1.5rem;
+  position: relative;
+}
+
+.featured-bounties__arrow {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  opacity: 0;
+  z-index: 1;
+  color: #10ce7c;
+  background: transparent;
+  border: none;
+}
+
+.featured-bounties__arrow:hover,
+.featured-bounties__arrow:focus {
+  color: #57e6a8;
+  opacity: 1;
+}
+
+.featured-bounties:hover .featured-bounties__arrow {
+  opacity: 1;
+}
+
+.featured-bounties__arrow-left {
+  left: 0;
+}
+
+.featured-bounties__arrow-right {
+  right: 10px;
 }
 
 .featured-bounties__title {

app/assets/v2/css/grants/detail.css

@@ -3,7 +3,7 @@
     max-width: 85vw
   }
 
-  #editor.ql-bubble .ql-editor {
+  #editor.ql-bubble .ql-editor[contenteditable='false'] {
     padding: 0;
   }
 

app/assets/v2/css/hackathons/explorer.css

@@ -26,12 +26,12 @@
 }
 
 .banner .sponsors-gold img {
-  width: 11rem;
+  height: 6rem;
   margin: 1em;
 }
 
 .banner .sponsors-silver img {
-  width: 7.5rem;
+  height: 3.5rem;
   margin: 0.8em;
 }
 
@@ -48,4 +48,13 @@
 /* Beyond Blockchain 2019 */
 #beyondblockchain_2019 {
   background: #121315;
+}
+
+/* Grow Ethereum 2019 */
+#grow-ethereum-2019 {
+  border-bottom: solid 0.5px #eee;
+}
+
+#grow-ethereum-2019 .text-white {
+  color: black !important; /* TODO: REMOVE */
 }