feat: round 7 changes

app/app/context.py

@@ -68,6 +68,7 @@ def preprocess(request):
     """Handle inserting pertinent data into the current context."""
 
     # make lbcheck super lightweight
+
     if request.path == '/lbcheck':
         return {}
 

app/app/fixtures/economy.json

@@ -24328,5 +24328,50 @@
       "metadata": {},
       "approved": true
     }
+  },
+  {
+    "model": "economy.token",
+    "pk": 363,
+    "fields": {
+      "created_on": "2020-08-28T00:52:18Z",
+      "modified_on": "2020-08-28T01:38:48.009Z",
+      "address": "0x3b00ef435fa4fcff5c209a37d1f3dcff37c705ad",
+      "symbol": "USDT",
+      "network": "rinkeby",
+      "decimals": 6,
+      "priority": 1,
+      "metadata": {},
+      "approved": true
+    }
+  },
+  {
+    "model": "economy.token",
+    "pk": 364,
+    "fields": {
+      "created_on": "2020-08-28T00:52:18Z",
+      "modified_on": "2020-08-28T01:38:48.009Z",
+      "address": "0xeb8f08a975ab53e34d8a0330e0d34de942c95926",
+      "symbol": "USDC",
+      "network": "rinkeby",
+      "decimals": 6,
+      "priority": 1,
+      "metadata": {},
+      "approved": true
+    }
+  },
+  {
+    "model": "economy.token",
+    "pk": 364,
+    "fields": {
+      "created_on": "2020-08-28T00:52:18Z",
+      "modified_on": "2020-08-28T01:38:48.009Z",
+      "address": "0x4da8d0795830f75be471f072a034d42c369b5d0a",
+      "symbol": "LINK",
+      "network": "rinkeby",
+      "decimals": 18,
+      "priority": 1,
+      "metadata": {},
+      "approved": true
+    }
   }
 ]

app/assets/v2/css/grants/card.css

@@ -9,22 +9,38 @@
   margin-top: 1.0625rem;
 }
 
+.grant-item--list {
+  padding-bottom: 10px;
+}
+
+.grant-item--list:hover {
+  background-color: #EFEAFD;
+}
+
 .flip-card__flipper {
   border: 1px solid #D3D3D3;
 }
 
+.grant-item--list .grant-item__content {
+  margin-top: 0.938rem;
+}
+
 .grant-item__title {
   line-height: 24px;
   overflow-y: hidden;
   font-weight: bold;
-  font-size: 1.25rem;
   margin-bottom: 15px;
 }
 
 .grant-item__title a {
   color: #454545;
 }
 
+.grant-item--list .grant-item__title {
+  font-size: 1rem;
+  margin-bottom: 2px;
+}
+
 .grant-item__pitch {
   color: #666666;
   height: 3.8rem;
@@ -65,6 +81,12 @@
   margin: 13px;
 }
 
+.grant-item--list .grant-item__img {
+  height: 3.1rem;
+  overflow: hidden;
+  margin: 10px 12px;
+}
+
 .grant-item__owner-image,
 .flip-card__flipper .grant__stakeholders-item {
   height: 35px;
@@ -97,6 +119,11 @@
   color: #0D0764;
 }
 
+.grant-item--list .grant-item__owner-image {
+  height: 20px;
+  width: 20px;
+}
+
 .grant-item__funding-label {
   color: #BBBDBF;
 }
@@ -208,6 +235,34 @@
   color: #040404;
 }
 
+.match__round--inline {
+  color: #069953;
+}
 .clr-prediction .amount {
   margin-top: 7px;
-}
+}
+
+.star-action:hover {
+  color: var(--gc-blue-hover) !important;
+}
+
+@media (max-width: 500px) {
+  .grant-item--list .grant-item__owner {
+    align-items: baseline;
+    display: flex;
+    flex-direction: column;
+  }
+  .grant-item--list .match, .grant-item--list .star-action {
+    margin-top: 5px !important;
+    margin-left: 0 !important;
+  }
+
+  .grant-item--list .match {
+    flex-direction: column;
+  }
+
+  .grant-item--list .grant-action {
+    padding-top: 5px !important;
+    padding-bottom: 5px !important;
+  }
+}

app/assets/v2/css/grants/grant.css

@@ -392,7 +392,7 @@
 }
 
 .grants-hero .title-round{
-  font-size: 24px; 
+  font-size: 24px;
 }
 
 .grants-hero .font-header,
@@ -450,7 +450,7 @@
   background: transparent !important;
 }
 
-#search_form .select2-container {
+#top-filters .select2-container, #search_form .select2-container {
   width: auto !important;
   font-weight: normal;
   text-align: left;
@@ -462,22 +462,22 @@
 
 }
 
-#search_form .select2-network-container {
+#top-filters .select2-network-container, #search_form .select2-network-container {
   width: 5rem !important;
 }
 
-#search_form .network-container .select2-container {
+#top-filters .select2-container, #search_form .network-container .select2-container {
   min-width: 5rem;
 }
 
-#search_form .select2-selection {
+#top-filters .select2-selection, #search_form .select2-selection {
   background: none;
   outline: none;
   border: none !important;
   color: var(--gc-blue);
 }
 
-#search_form .select2-selection span {
+#top-filters .select2-selection span, #search_form .select2-selection span {
   color: #3E00FF;
   font-weight: bold;
 }
@@ -629,15 +629,32 @@ background: linear-gradient(85.75deg, #03008D -17.8%, #000000 139.56%); /* W3C,
   letter-spacing: 2px;
 }
 
+.grants_hero_img{
+  background-position-x: 50%;
+  background-color: #030118;
+}
+.grants_hero_img .container{
+  min-height: 400px;
+}
+
+#container_bar{
+  background-color: #030118;
+}
+
 @media (max-width: 991.98px) {
-  #sidebar_container form#filters {
+  .grants_hero_img .container{
+    min-height: 350px;
+  }
+  .hide_filters {
     height: 0;
     display: none;
   }
+
   #sidebar_container form#search_form {
     display: inline-block;
     width: 95%;
   }
+}
 
 /* sidebar_search.css */
 
@@ -652,7 +669,17 @@ background: linear-gradient(85.75deg, #03008D -17.8%, #000000 139.56%); /* W3C,
 }
 
 
+@media (max-width: 540px) {
+  .grants_hero_img .container{
+    min-height: 220px;
+  }
+}
+
+
 @media (max-width: 390px) {
+  .grants_hero_img .container{
+    min-height: 200px;
+  }
   #search_form .sort_container .select2-container {
     width: 200px !important;
   }

app/assets/v2/css/sidebar_search.css

@@ -92,11 +92,6 @@
 }
 
 @media (max-width: 991.98px) {
-  #sidebar_container form {
-    height: 0;
-    display: none;
-  }
-
   #expand {
     display: inherit;
   }

app/assets/v2/js/grants/detail.js

@@ -200,40 +200,18 @@ $(document).ready(function() {
 
   $('#cancel_grant').on('click', function(e) {
     $('.modal-cancel-grants').on('click', function(e) {
-      let contract_address = $('#contract_address').val();
-      let grant_cancel_tx_id;
-      let deployedSubscription = new web3.eth.Contract(compiledSubscription.abi, contract_address);
-
-      web3.eth.getAccounts(function(err, accounts) {
-        deployedSubscription.methods.endContract()
-          .send({
-            from: accounts[0],
-            gas: 3000000
-          }).on('transactionHash', function(transactionHash) {
-            grant_cancel_tx_id = $('#grant_cancel_tx_id').val();
-            const linkURL = get_etherscan_url(transactionHash);
-
-            document.issueURL = linkURL;
-            $('#transaction_url').attr('href', linkURL);
-            $('.modal .close').trigger('click');
-            enableWaitState('#grants-details');
-          })
-          .on('confirmation', function(confirmationNumber, receipt) {
-            $.ajax({
-              type: 'post',
-              url: '',
-              data: {
-                'contract_address': contract_address,
-                'grant_cancel_tx_id': grant_cancel_tx_id
-              },
-              success: function(json) {
-                window.location.reload(false);
-              },
-              error: function() {
-                _alert({ message: gettext('Canceling your grant failed to save. Please try again.') }, 'error');
-              }
-            });
-          });
+      $.ajax({
+        type: 'post',
+        url: '',
+        data: {
+          'grant_cancel_tx_id': '0x0'
+        },
+        success: function(json) {
+          window.location.reload(false);
+        },
+        error: function() {
+          _alert({ message: gettext('Canceling your grant failed to save. Please try again.') }, 'error');
+        }
       });
     });
   });

app/assets/v2/js/grants/funding.js

@@ -239,19 +239,9 @@ function hideSideCart() {
 }
 
 function toggleSideCart() {
-  $('#grants-details').toggleClass('col-12');
-  $('#grants-details').toggleClass('col-md-8');
-  $('#grants-details').toggleClass('col-lg-9');
-  $('#grants-details').toggleClass('d-none');
-  $('#grants-details').toggleClass('d-md-block');
+  $('#grants-details > div').toggleClass('col-12 col-md-8 col-lg-9 d-none d-md-block');
 
   $('#side-cart').toggle();
-  $('#side-cart').toggleClass('col-12');
-  $('#side-cart').toggleClass('col-md-4');
-  $('#side-cart').toggleClass('col-lg-3');
-
-  $('#funding-card').toggleClass('mr-md-5');
-  $('#funding-card').toggleClass('mr-md-3');
-  $('#funding-card').toggleClass('d-none');
-  $('#funding-card').toggleClass('d-lg-block');
+  $('#side-cart').toggleClass('col-12 col-md-4 col-lg-3');
+  $('#funding-card').toggleClass('mr-md-5 mr-md-3 d-none d-lg-block');
 }