Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add cookielaw and fix styles #4939

Merged
merged 1 commit into from
Aug 1, 2019
Merged

add cookielaw and fix styles #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/assets/v2/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
background-color: transparent;
}

.homepage .container {
padding-bottom: 4rem;
padding-top: 4rem;
}

.banner {
background-color: #0d023b;
background-size: cover;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/css/profile.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.profile_details .container{
.mh-150{
min-height: 150px;
}

Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/onepager/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions app/dashboard/templates/profiles/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion app/dashboard/templates/shared/labs_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}">
Expand Down Expand Up @@ -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 %}
3 changes: 0 additions & 3 deletions app/dashboard/templates/shared/rate_bounties.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions app/grants/templates/grants/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion app/grants/templates/grants/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion app/kudos/templates/kudos_about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion app/kudos/templates/kudos_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion app/kudos/templates/kudos_marketplace.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion app/kudos/templates/shared/kudos_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion app/retail/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions app/retail/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 %}
Expand Down
15 changes: 8 additions & 7 deletions app/retail/templates/home/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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 %}
Expand All @@ -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>
Expand All @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions app/retail/templates/home/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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 %}
Expand All @@ -114,4 +114,5 @@
</nav>
</div>

</nav>
</nav>
{% cookielaw_banner %}
2 changes: 1 addition & 1 deletion app/retail/templates/jobs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/mission.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/not_a_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion app/retail/templates/shared/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion app/retail/templates/vision.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down