From 93c1588c7429b4536bf26cf6f010fceed21c9677 Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Fri, 8 Jun 2018 20:16:42 +0530 Subject: [PATCH 1/7] bounty_detail: fixed image and text overlap Fixes: https://github.com/gitcoinco/web/issues/1388 --- app/assets/v2/css/bounty.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index 4199f52583d..8ad1b8afe5b 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -366,6 +366,9 @@ a.btn { max-height: 30rem; max-width: 30rem; cursor: pointer; + display: block; + margin-top: 1rem; + margin-bottom: 1rem; } #bounty_details #issue_description h1, From dcb63d7879ac87f2d984252c626a7161c30c665e Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Fri, 8 Jun 2018 21:00:49 +0530 Subject: [PATCH 2/7] updated avatar size and shape in nav --- app/assets/v2/css/base.css | 15 ++++++++++++++- app/assets/v2/css/landing_page.css | 1 + app/dashboard/templates/shared/nav_auth.html | 2 +- app/retail/templates/shared/nav.html | 12 ++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index e388b1dee00..6642017d247 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -19,9 +19,14 @@ span { .nav_avatar { cursor: pointer; + border-radius: 50%; } -.dropdown-menu{ +#navbarDropdown { + text-transform: none; +} + +.dropdown-menu { z-index: 9999999999; } @@ -29,6 +34,14 @@ span { border-radius: 2px; } +.nav_avatar, +.navbar__cta, +.nav-item.dropdown, +.navbar-nav .nav-link { + margin-top: auto; + margin-bottom: auto; +} + .nav-link.login i { font-size: 1.5em; position: relative; diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index f9cf04fa25c..4bde2490c5b 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -373,6 +373,7 @@ body { opacity: 0; display: none; transition: opacity .3s; + padding-right: 1rem; } .navbar.following .navbar__cta { diff --git a/app/dashboard/templates/shared/nav_auth.html b/app/dashboard/templates/shared/nav_auth.html index bb5cc29862a..4461e7c93a6 100644 --- a/app/dashboard/templates/shared/nav_auth.html +++ b/app/dashboard/templates/shared/nav_auth.html @@ -70,7 +70,7 @@ - {% else %} + {% if request.path == '/' %} + + + Fund an Issue + + {% endif %} {% include 'shared/nav_auth.html' with source='authed' %} - {% if request.path == '/' %} - - - Fund an Issue - - {% endif %} From 50bc7cb2c0207ddf2615f4f78d3d9ab0b00e2ead Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Fri, 8 Jun 2018 22:51:35 +0530 Subject: [PATCH 3/7] newletter: incorporated changes - flexibly remove consent and caption text - changed position in landing page - update relevant CSS --- app/assets/v2/css/landing_page.css | 25 +++++++++++++++---- .../templates/shared/newsletter.html | 9 ++++--- app/retail/templates/index.html | 9 +++---- app/retail/views.py | 3 +++ 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index 4bde2490c5b..a9d74d69202 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -23,11 +23,6 @@ body { background-color:#0ECF7C; } -.landing__newsletter { - width: 100%; - margin: auto; -} - .youtube iframe { max-width: 100%; } @@ -195,6 +190,22 @@ body { padding-bottom: 1rem; } +.landing__newsletter { + width: 100%; + margin: auto; +} + +.landing__newsletter .newsletter { + border-top: none; + margin-top: 0; +} + +.landing__newsletter .newsletter h4 { + padding-top: 1.25rem; + padding-bottom: 0.5rem; + font-weight: normal; +} + .pilot_container { background: white; } @@ -483,6 +494,10 @@ body { margin-left: 10rem; margin-right: 10rem; } + + #newsletter-input { + min-width: 18rem; + } } @media (max-width: 575.98px) { diff --git a/app/dashboard/templates/shared/newsletter.html b/app/dashboard/templates/shared/newsletter.html index 4d9bc8245be..3da3f5930ec 100644 --- a/app/dashboard/templates/shared/newsletter.html +++ b/app/dashboard/templates/shared/newsletter.html @@ -25,17 +25,20 @@

{% if newsletter_headline %} {{ newsletter_headline }} {% else %} - {% trans "Join Our Newsletter !" %} + {% trans "Join Our Newsletter!" %} {% endif %}

- + {% if not hide_newsletter_caption %} + + {% endif %}
+ {% if not hide_newsletter_consent %} {% trans "You may withdraw email consent at any time" %} | {% trans "Manage preferences" %} | {% trans "Opt out" %} | {% trans "Email us" %} - + {% endif %} diff --git a/app/retail/templates/index.html b/app/retail/templates/index.html index 62b8d8fee5e..0952176b59e 100644 --- a/app/retail/templates/index.html +++ b/app/retail/templates/index.html @@ -148,6 +148,10 @@

{% trans "Grow Your Open Source Community" %}

+ +
Gitcoin Tree @@ -361,11 +365,6 @@

{% trans "Who's Using Gitcoin?" %}

{% include 'landing/pilot.html' %} {% include 'landing/press.html' %} - {% include 'shared/footer.html' %}
diff --git a/app/retail/views.py b/app/retail/views.py index d3b3da4fb2f..6f04eea0241 100644 --- a/app/retail/views.py +++ b/app/retail/views.py @@ -54,6 +54,9 @@ def index(request): 'slides': slides, 'slideDurationInMs': 6000, 'active': 'home', + 'hide_newsletter_caption': True, + 'hide_newsletter_consent': True, + 'newsletter_headline': _("Get the Latest Gitcoin News! Join Our Newsletter."), } return TemplateResponse(request, 'index.html', context) From 9abc6c1e3d644fd803d5a306ecfad35423b59c02 Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Sat, 9 Jun 2018 00:26:04 +0530 Subject: [PATCH 4/7] newlettter: remove placeholder --- app/dashboard/templates/shared/newsletter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/templates/shared/newsletter.html b/app/dashboard/templates/shared/newsletter.html index 3da3f5930ec..7111e30d0b9 100644 --- a/app/dashboard/templates/shared/newsletter.html +++ b/app/dashboard/templates/shared/newsletter.html @@ -32,7 +32,7 @@

{% endif %}
- +
{% if not hide_newsletter_consent %} From a77ce20b3751e4f7b93e45210c364a993e31d35a Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Sat, 9 Jun 2018 00:37:26 +0530 Subject: [PATCH 5/7] nav: fix paddding issue --- app/assets/v2/css/landing_page.css | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index a9d74d69202..a6d21bd845a 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -15,10 +15,6 @@ body { display: none !important; } -.navbar-nav .nav-link:last-child { - padding-right: 0 !important; -} - .banner--green { background-color:#0ECF7C; } @@ -495,8 +491,15 @@ body { margin-right: 10rem; } - #newsletter-input { - min-width: 18rem; + .newsletter #newsletter-input { + padding: 10px !important; + min-width: 18rem !important; + font-size: 16px !important; + } + + #newsletter-subscribe { + height: 44px; + top: -1px; } } From 7f5b4a59a19b3785e83440b4701ee4f30758f7ef Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Sat, 9 Jun 2018 01:44:35 +0530 Subject: [PATCH 6/7] Updated newsletter tracking color --- app/assets/v2/css/landing_page.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index a6d21bd845a..612a73d5588 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -495,10 +495,11 @@ body { padding: 10px !important; min-width: 18rem !important; font-size: 16px !important; + border: 1px solid #888 !important; } #newsletter-subscribe { - height: 44px; + height: 46px; top: -1px; } } From 2d4b0c02add20b0653778e7af6bf95fc0c807de5 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Sat, 9 Jun 2018 01:56:40 +0530 Subject: [PATCH 7/7] Updates Subscribe button to normal gitcoin button style --- app/assets/v2/css/landing_page.css | 3 ++- app/dashboard/templates/shared/newsletter.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index 612a73d5588..b2c6a021ce8 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -500,7 +500,8 @@ body { #newsletter-subscribe { height: 46px; - top: -1px; + top: -2px; + position: relative; } } diff --git a/app/dashboard/templates/shared/newsletter.html b/app/dashboard/templates/shared/newsletter.html index 7111e30d0b9..47e954f83d4 100644 --- a/app/dashboard/templates/shared/newsletter.html +++ b/app/dashboard/templates/shared/newsletter.html @@ -32,8 +32,8 @@

{% endif %}
- - + +
{% if not hide_newsletter_consent %}