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/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, diff --git a/app/assets/v2/css/landing_page.css b/app/assets/v2/css/landing_page.css index f9cf04fa25c..b2c6a021ce8 100644 --- a/app/assets/v2/css/landing_page.css +++ b/app/assets/v2/css/landing_page.css @@ -15,19 +15,10 @@ body { display: none !important; } -.navbar-nav .nav-link:last-child { - padding-right: 0 !important; -} - .banner--green { background-color:#0ECF7C; } -.landing__newsletter { - width: 100%; - margin: auto; -} - .youtube iframe { max-width: 100%; } @@ -195,6 +186,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; } @@ -373,6 +380,7 @@ body { opacity: 0; display: none; transition: opacity .3s; + padding-right: 1rem; } .navbar.following .navbar__cta { @@ -482,6 +490,19 @@ body { margin-left: 10rem; margin-right: 10rem; } + + .newsletter #newsletter-input { + padding: 10px !important; + min-width: 18rem !important; + font-size: 16px !important; + border: 1px solid #888 !important; + } + + #newsletter-subscribe { + height: 46px; + top: -2px; + position: relative; + } } @media (max-width: 575.98px) { 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 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" %}

+
+ {% include 'shared/newsletter.html' %} +
+
Gitcoin Tree @@ -361,11 +365,6 @@

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

{% include 'landing/pilot.html' %} {% include 'landing/press.html' %} -
-
- {% include 'shared/newsletter.html' %} -
-
{% include 'shared/footer.html' %}
diff --git a/app/retail/templates/shared/nav.html b/app/retail/templates/shared/nav.html index 42f5a5f02d8..488f03d6b5b 100644 --- a/app/retail/templates/shared/nav.html +++ b/app/retail/templates/shared/nav.html @@ -48,14 +48,14 @@ {% trans " Help" %} + {% if request.path == '/' %} + + + Fund an Issue + + {% endif %} {% include 'shared/nav_auth.html' with source='authed' %} - {% if request.path == '/' %} - - - Fund an Issue - - {% endif %} 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)