From d6148565084088fba7244638e4e9ea2736f3a5c0 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Thu, 1 Aug 2019 14:37:38 -0300
Subject: [PATCH] add cookielaw and fix styles

---
 app/assets/v2/css/home.css                        |  5 -----
 app/assets/v2/css/profile.css                     |  2 +-
 app/dashboard/templates/onepager/base.html        |  2 +-
 app/dashboard/templates/profiles/profile.html     |  6 +++---
 app/dashboard/templates/shared/labs_nav.html      |  3 ++-
 app/dashboard/templates/shared/rate_bounties.html |  3 ---
 app/grants/templates/grants/index.html            |  1 +
 app/grants/templates/grants/nav.html              |  3 ++-
 app/kudos/templates/kudos_about.html              |  2 +-
 app/kudos/templates/kudos_details.html            |  2 +-
 app/kudos/templates/kudos_marketplace.html        |  2 +-
 app/kudos/templates/shared/kudos_nav.html         |  3 ++-
 app/retail/templates/about.html                   |  2 +-
 app/retail/templates/base.html                    |  3 +--
 app/retail/templates/home/index.html              | 15 ++++++++-------
 app/retail/templates/home/nav.html                |  7 ++++---
 app/retail/templates/jobs.html                    |  2 +-
 app/retail/templates/mission.html                 |  2 +-
 app/retail/templates/not_a_token.html             |  2 +-
 app/retail/templates/shared/nav.html              |  3 ++-
 app/retail/templates/vision.html                  |  2 +-
 21 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/app/assets/v2/css/home.css b/app/assets/v2/css/home.css
index c62242b5e4d..50fe0744fa4 100644
--- a/app/assets/v2/css/home.css
+++ b/app/assets/v2/css/home.css
@@ -22,11 +22,6 @@
   background-color: transparent;
 }
 
-.homepage .container {
-  padding-bottom: 4rem;
-  padding-top: 4rem;
-}
-
 .banner {
   background-color: #0d023b;
   background-size: cover;
diff --git a/app/assets/v2/css/profile.css b/app/assets/v2/css/profile.css
index 179ab1bbbd7..a06eb1fb8c1 100644
--- a/app/assets/v2/css/profile.css
+++ b/app/assets/v2/css/profile.css
@@ -1,4 +1,4 @@
-.profile_details .container{
+.mh-150{
   min-height: 150px;
 }
 
diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html
index d91c81a3ea1..15148f1e7e9 100644
--- a/app/dashboard/templates/onepager/base.html
+++ b/app/dashboard/templates/onepager/base.html
@@ -72,9 +72,9 @@
 
     <!-- Wrapper -->
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
+    {% cookielaw_banner %}
     <div id="wrapper" class="container-fluid">
       {% include 'shared/onepager_auth.html' with source='authed' %}
-      {% cookielaw_banner %}
       <!-- Main -->
       {% block 'main' %} {% endblock %}
       <footer id="footer" class="copyright d-flex font-smaller-1 justify-content-center mt-5 p-4">
diff --git a/app/dashboard/templates/profiles/profile.html b/app/dashboard/templates/profiles/profile.html
index 1a92a10b67e..c9c4aa11770 100644
--- a/app/dashboard/templates/profiles/profile.html
+++ b/app/dashboard/templates/profiles/profile.html
@@ -37,7 +37,7 @@
     </div>
     <div class="container-fluid bg-light">
 
-        <div class="container profile-card mt-md-n5">
+        <div class="container profile-card mt-md-n5 mh-150">
           <div class="row">
             <div class="col-12 col-lg-6 profile-header__main-infos">
               {% if not hidden %}
@@ -222,7 +222,7 @@ <h1 class="profile-header__handle">
       {% else %}
 
       {% if not profile.is_org and profile.organizations|length %}
-        <div class="container px-md-0">
+        <div class="container px-md-0 mh-150">
           <div class="row">
           <div class="col py-4 px-md-0">
             <div class="pb-2 profile-section-title">
@@ -248,7 +248,7 @@ <h1 class="profile-header__handle">
 
       {% if tabs %}
         <div class="row pt-4 py-2">
-          <div class="container profile-bounties profile-bounties--activities">
+          <div class="container profile-bounties profile-bounties--activities mh-150">
             <div class="row">
               <div class="col-12 px-4 px-lg-0">
                 <span class="font-caption profile-bounties__sort_label">{% trans 'By Created Date' %}</span>
diff --git a/app/dashboard/templates/shared/labs_nav.html b/app/dashboard/templates/shared/labs_nav.html
index 10b23e2955d..545ae26f487 100644
--- a/app/dashboard/templates/shared/labs_nav.html
+++ b/app/dashboard/templates/shared/labs_nav.html
@@ -15,7 +15,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 {% endcomment %}
-{% load i18n static matches %}
+{% load i18n static matches cookielaw_tags %}
 <nav class="navbar navbar-expand-md navbar-dark gitcoin-background">
   <div id="gitcoin-background"></div>
   <a class="navbar-brand pt-0 pb-0 brand-hover" href="{% url 'labs' %}">
@@ -58,3 +58,4 @@
 {% if request.path|matches:"^\/((explorer)|(issue.*)|(.*new.*))$" %}
   <p id="navbar-network-banner" class="px-0 py-1 m-0 font-caption hidden"></p>
 {% endif %}
+{% cookielaw_banner %}
diff --git a/app/dashboard/templates/shared/rate_bounties.html b/app/dashboard/templates/shared/rate_bounties.html
index 7780e87c5d9..a2c78e64267 100644
--- a/app/dashboard/templates/shared/rate_bounties.html
+++ b/app/dashboard/templates/shared/rate_bounties.html
@@ -26,9 +26,6 @@
     </li>
   </ul>
   <div class="tab-content bg-white p-5" id="ratingTabsContent">
-    <div class="tab-pane fade" id="rating2" role="tabpanel" aria-labelledby="home-tab">
-      sdf
-    </div>
     <div class="tab-pane fade show active" id="rating" role="tabpanel" aria-labelledby="home-tab">
       <ul class="nav nav-tabs" id="tabsRatingSelection" role="tablist">
         <li class="nav-item">
diff --git a/app/grants/templates/grants/index.html b/app/grants/templates/grants/index.html
index c88ab6158db..e13f4d5d61d 100644
--- a/app/grants/templates/grants/index.html
+++ b/app/grants/templates/grants/index.html
@@ -26,6 +26,7 @@
     <div class="container-fluid header dash">
       {% include 'shared/top_nav.html' with class='d-md-flex' %}
       {% include 'grants/nav.html' %}
+
       <div class="container py-5 ">
         <div class="grants-hero white my-5">
           <div class="row">
diff --git a/app/grants/templates/grants/nav.html b/app/grants/templates/grants/nav.html
index 379ee1ffc0b..7b1f4db579d 100644
--- a/app/grants/templates/grants/nav.html
+++ b/app/grants/templates/grants/nav.html
@@ -15,7 +15,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 {% endcomment %}
-{% load i18n static matches %}
+{% load i18n static matches cookielaw_tags %}
 <nav class="navbar navbar-expand-md navbar-dark gitcoin-background">
   <a class="navbar-brand pt-0 pb-0 brand-hover" href="{% url 'grants:grants' %}">
     <img class="mw-100 logo-static" src="{% static "v2/images/grants/grants-logo.svg" %}" alt="Grants" height="50">
@@ -58,3 +58,4 @@
 {% if request.path|matches:"^\/((.*new)|(.*cancel)|(.*fund))$" %}
   <p id="navbar-network-banner" class="px-0 py-1 m-0 font-caption hidden"></p>
 {% endif %}
+{% cookielaw_banner %}
diff --git a/app/kudos/templates/kudos_about.html b/app/kudos/templates/kudos_about.html
index 0993d725383..8007dfb7561 100644
--- a/app/kudos/templates/kudos_about.html
+++ b/app/kudos/templates/kudos_about.html
@@ -26,7 +26,7 @@
   </head>
   <body class="{{ active }} g-font-muli">
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <header class="container-fluid header">
+    <header class="header">
       {% include 'shared/kudos_nav.html' %}
       <!-- {% include 'shared/kudos_banner.html' %} -->
       <div class="container text-center mt-5">
diff --git a/app/kudos/templates/kudos_details.html b/app/kudos/templates/kudos_details.html
index b9886946e09..e72117d0b43 100644
--- a/app/kudos/templates/kudos_details.html
+++ b/app/kudos/templates/kudos_details.html
@@ -10,7 +10,7 @@
   </head>
   <body class="{{ active }} bg-light g-font-muli">
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <header class="container-fluid header">
+    <header class="header">
       {% include 'shared/kudos_nav.html' %}
       <!-- {% include 'shared/kudos_banner.html' %} -->
       <div class="container pb-5">
diff --git a/app/kudos/templates/kudos_marketplace.html b/app/kudos/templates/kudos_marketplace.html
index 1e129eb8d24..23bce819a03 100644
--- a/app/kudos/templates/kudos_marketplace.html
+++ b/app/kudos/templates/kudos_marketplace.html
@@ -8,7 +8,7 @@
   </head>
   <body class="{{ active }} bg-light g-font-muli">
       {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <header class="container-fluid header">
+    <header class="header">
       {% include 'shared/kudos_nav.html' %}
       <!-- {% include 'shared/kudos_banner.html' %} -->
       <div class="container pb-5">
diff --git a/app/kudos/templates/shared/kudos_nav.html b/app/kudos/templates/shared/kudos_nav.html
index 0c4bba5d39b..70569acb3d0 100644
--- a/app/kudos/templates/shared/kudos_nav.html
+++ b/app/kudos/templates/shared/kudos_nav.html
@@ -15,7 +15,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 {% endcomment %}
-{% load i18n static matches %}
+{% load i18n static matches cookielaw_tags %}
 <nav class="navbar navbar-expand-md navbar-dark gitcoin-background">
   <a class="navbar-brand pt-0 pb-0 brand-hover" href="{% url 'kudos_main' %}">
     <img class="mw-100 logo-static" src="{% static "v2/images/kudos/logo.svg" %}" alt="kudos" height="50">
@@ -58,3 +58,4 @@
 {% if request.path|matches:"^\/((explorer)|(issue.*)|(.*new.*))$" %}
   <p id="navbar-network-banner" class="px-0 py-1 m-0 font-caption hidden"></p>
 {% endif %}
+{% cookielaw_banner %}
diff --git a/app/retail/templates/about.html b/app/retail/templates/about.html
index c1e6f1e5435..59f5f292ace 100644
--- a/app/retail/templates/about.html
+++ b/app/retail/templates/about.html
@@ -28,7 +28,7 @@
   <body class="{{ active }} g-font-muli">
     {% include 'shared/tag_manager_2.html' %}
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <div class="container-fluid header">
+    <div class=" header">
       {% include 'home/nav.html' %}
       {% include 'shared/minihero.html' with h1='About' %}
     </div>
diff --git a/app/retail/templates/base.html b/app/retail/templates/base.html
index 67ebd06eafb..a68ead12b1a 100644
--- a/app/retail/templates/base.html
+++ b/app/retail/templates/base.html
@@ -14,7 +14,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
-{% load cookielaw_tags static %}
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -35,7 +35,6 @@
       {% include 'shared/minihero.html' with h1=minihero %}
     {% endif %}
   </div>
-  {% cookielaw_banner %}
   <div class="row mt-5 pb-0">
     <div class="col text-center body">
       {% block body %}{% endblock %}
diff --git a/app/retail/templates/home/index.html b/app/retail/templates/home/index.html
index 1a28f3bc49b..843196f68f2 100644
--- a/app/retail/templates/home/index.html
+++ b/app/retail/templates/home/index.html
@@ -14,7 +14,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
-{% load i18n static cookielaw_tags %}
+{% load i18n static %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -30,6 +30,7 @@
       {% include 'shared/top_nav.html' with class='d-md-flex' %}
       {% include 'home/nav.html' %}
     </div>
+
     <div class="banner header overflow-hidden">
       <div class="row">
         <div class="col-12 col-md-8 col-xl-6 pl-lg-5">
@@ -94,7 +95,7 @@ <h2 class="font-title-xl mt-4">
     </div>
 
     <div id="optimize_oss" class="mt-5 pt-4 optimize_oss">
-      <div class="container pt-0">
+      <div class="container pt-0 pb-5">
         <div class="row">
           <div class="col-12 col-md-8 col-lg-6 g-fadein" data-fade-duration=1000 data-fade-direction="left">
             <h2>
@@ -148,7 +149,7 @@ <h2>
     <div class="products" id="products">
       <img class="text-center px-3 bot-circle" src="{% static "v2/images/home/bot-circle.svg" %}"
         alt="gitcoin logo" />
-      <div class="container pt-0">
+      <div class="container pt-0 pb-5">
         <div class="row">
           <div class="col-12 col-md-6 col-lg-4 g-fadein" data-fade-duration=1000 data-fade-direction="left">
             <h4 class="font-title mb-4">{% trans "Grow OSS" %}</h4>
@@ -217,7 +218,7 @@ <h2>
       </div>
     </div>
     <div id="realign" class="realign">
-      <div class="container" >
+      <div class="container py-5" >
         <div class="row mt-5">
           <div class="col-12 col-md-8 col-lg-6 g-fadein" data-fade-duration=1000 data-fade-direction="left">
             <h2>{% trans "Realign open source incentives" %}</h2>
@@ -252,7 +253,7 @@ <h2>{% trans "Realign open source incentives" %}</h2>
       </div>
     </div>
     <div id="press" class="press">
-      <div class="container">
+      <div class="container py-5">
         <div class="row">
           <h2 class="col-12 mb-4">{% trans "What are people saying?" %}</h2>
           {% for article in press %}
@@ -266,7 +267,7 @@ <h2 class="col-12 mb-4">{% trans "What are people saying?" %}</h2>
       </div>
     </div>
     <div id="know_us" class="know_us">
-      <div class="container">
+      <div class="container py-5">
         <div class="row">
           <div class="col-12 text-center mb-2">
             <h2>{% trans "Get to know us better" %}</h2>
@@ -288,7 +289,7 @@ <h2>{% trans "Get to know us better" %}</h2>
       </div>
     </div>
     <div id="articles" class="articles">
-      <div class="container">
+      <div class="container py-5">
         <div class="row">
           <div class="col-12 text-center mb-4">
             <h2>{% trans "Gitcoin on Medium" %}</h2>
diff --git a/app/retail/templates/home/nav.html b/app/retail/templates/home/nav.html
index ca61c282ee6..8826792ca52 100644
--- a/app/retail/templates/home/nav.html
+++ b/app/retail/templates/home/nav.html
@@ -15,7 +15,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 {% endcomment %}
-{% load i18n static matches %}
+{% load i18n static matches cookielaw_tags %}
 <nav class="navbar navbar-expand-md navbar-dark g-font-muli">
   <a class="navbar-brand pt-0 pb-0" href="/">
     <img id="logo" src="{% static "v2/images/logo_large.png" %}" data-hover="{% static "v2/images/logo_med_hover.gif" %}" width="150" height="50" />
@@ -102,7 +102,7 @@
 
       <!-- <a class="nav-link interior" href="{% url "pricing" %}">{% trans "Pricing" %}</a> -->
     </nav>
-    <nav class="navbar-nav mr-3">      
+    <nav class="navbar-nav mr-3">
       {% if user.is_authenticated %}
         {% include 'shared/nav_auth.html' with source='authed' %}
       {% else %}
@@ -114,4 +114,5 @@
     </nav>
   </div>
 
-</nav>
\ No newline at end of file
+</nav>
+{% cookielaw_banner %}
diff --git a/app/retail/templates/jobs.html b/app/retail/templates/jobs.html
index 942ff3c0e01..bf1fb0a0fd8 100644
--- a/app/retail/templates/jobs.html
+++ b/app/retail/templates/jobs.html
@@ -30,7 +30,7 @@
   <body class="{{ active }} g-font-muli">
     {% include 'shared/tag_manager_2.html' %}
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <div class="container-fluid header">
+    <div class="header">
       {% include 'home/nav.html' %}
       {% include 'shared/minihero.html' with h1='Jobs' position_h1_below_logo=1 %}
     </div>
diff --git a/app/retail/templates/mission.html b/app/retail/templates/mission.html
index 3b6e6814394..3396bbc3128 100644
--- a/app/retail/templates/mission.html
+++ b/app/retail/templates/mission.html
@@ -31,7 +31,7 @@
   <body class="{{ active }} g-font-muli">
     {% include 'shared/tag_manager_2.html' %}
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <div class="container-fluid header">
+    <div class="header">
       {% include 'home/nav.html' %}
       {% include 'shared/minihero.html' with h1='Mission' position_h1_below_logo=1 %}
     </div>
diff --git a/app/retail/templates/not_a_token.html b/app/retail/templates/not_a_token.html
index 4259cf3fa1f..0da79d3557c 100644
--- a/app/retail/templates/not_a_token.html
+++ b/app/retail/templates/not_a_token.html
@@ -29,7 +29,7 @@
 
     {% include 'shared/tag_manager_2.html' %}
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <div class="container-fluid header">
+    <div class="header">
       {% include 'home/nav.html' %}
       {% include 'shared/minihero.html' with suppress_logo=True h1='Why Gitcoin didn’t do a Utility Token ICO' position_h1_below_logo=1 %}
     </div>
diff --git a/app/retail/templates/shared/nav.html b/app/retail/templates/shared/nav.html
index a0c7bf7e918..dcdeebb2926 100644
--- a/app/retail/templates/shared/nav.html
+++ b/app/retail/templates/shared/nav.html
@@ -15,7 +15,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 {% endcomment %}
-{% load i18n static matches %}
+{% load i18n static matches cookielaw_tags %}
 <nav class="navbar navbar-expand-md navbar-dark g-font-muli gitcoin-background">
   <a class="navbar-brand pt-0 pb-0" href="/bounties/funder">
     <img id="logo" src="{% static "v2/images/top-bar/bounties_desktop.svg" %}" height="35" />
@@ -95,3 +95,4 @@
 {% if request.path|matches:"^\/((explorer)|(issue.*)|(.*new.*)|(.*fund.*)|(.*cancel.*))$" %}
   <p id="navbar-network-banner" class="px-0 py-1 m-0 font-caption hidden"></p>
 {% endif %}
+{% cookielaw_banner %}
diff --git a/app/retail/templates/vision.html b/app/retail/templates/vision.html
index 318926ab970..9bb098e160f 100644
--- a/app/retail/templates/vision.html
+++ b/app/retail/templates/vision.html
@@ -31,7 +31,7 @@
 
     {% include 'shared/tag_manager_2.html' %}
     {% include 'shared/top_nav.html' with class='d-md-flex' %}
-    <div class="container-fluid header">
+    <div class="header">
       {% include 'home/nav.html' %}
       {% include 'shared/minihero.html' with h1='Our Vision' position_h1_below_logo=1 suppress_logo=1 %}
     </div>