diff --git a/app/assets/v2/images/home/Flying_ppl_optimized.svg b/app/assets/v2/images/home/Flying_ppl_optimized.svg new file mode 100644 index 00000000000..cb005ac9167 --- /dev/null +++ b/app/assets/v2/images/home/Flying_ppl_optimized.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/images/home/GR13_Logo_desktop.png b/app/assets/v2/images/home/GR13_Logo_desktop.png new file mode 100644 index 00000000000..f21c789d40c Binary files /dev/null and b/app/assets/v2/images/home/GR13_Logo_desktop.png differ diff --git a/app/assets/v2/images/home/GR13_desktopBanner_bg.png b/app/assets/v2/images/home/GR13_desktopBanner_bg.png new file mode 100644 index 00000000000..dc71635b7e4 Binary files /dev/null and b/app/assets/v2/images/home/GR13_desktopBanner_bg.png differ diff --git a/app/assets/v2/js/grants/_detail.js b/app/assets/v2/js/grants/_detail.js index bbdde81bbd4..9ce860c9b2a 100644 --- a/app/assets/v2/js/grants/_detail.js +++ b/app/assets/v2/js/grants/_detail.js @@ -124,17 +124,6 @@ Vue.mixin({ }).catch(console.error); }, - backNavigation: function() { - const vm = this; - const lgt = localStorage.getItem('last_grants_title') || 'Grants'; - - const lgi = (document.referrer.indexOf(location.host) != -1 && !document.referrer.includes('grants/new')) ? 'javascript:history.back()' : '/grants/explorer'; - - if (lgi && lgt) { - vm.$set(vm.backLink, 'url', lgi); - vm.$set(vm.backLink, 'title', lgt); - } - }, scrollToElement(element) { const container = this.$refs[element]; @@ -174,15 +163,10 @@ if (document.getElementById('gc-grant-detail')) { grant: {}, tabSelected: 0, tab: null, - backLink: { - url: '/grants', - title: 'Grants' - } }; }, mounted: function() { this.enableTab(); - this.backNavigation(); this.fetchGrantDetails(); } }); diff --git a/app/assets/v2/scss/jtbd.scss b/app/assets/v2/scss/jtbd.scss index 5bacd6d6af5..d454747c9f8 100644 --- a/app/assets/v2/scss/jtbd.scss +++ b/app/assets/v2/scss/jtbd.scss @@ -13,3 +13,84 @@ max-width: 100%; } } + +.home-carousel { + .carousel-inner { + min-height: 500px; + } + .grants { + display: flex; + h3 { + margin-top: 2rem; + } + .dates { + font-weight: normal; + font-family: 'Miriam Libre'; + font-size: 32px; + color: $gc-teal-400; + text-align: center; + } + img { + width: 40%; + margin: 0 auto; + } + a { + width: 20%; + margin-left: 40%; + } + background-image: url(static('v2/images/home/GR13_desktopBanner_bg.png')); + background-size: 100% auto; + background-repeat: no-repeat; + min-height: 450px; + text-align: center; + } + li { + background-color: $gc-violet-400; + } + .carousel-caption { + h5 { + color: $gray-900; + } + } + .carousel-indicator { + z-index: auto; + } +} +.header-image { + img { + width: 100%; + } +} +@media screen and (max-width: 768px) { + .home-carousel { + .carousel-inner { + min-height: 525px; + } + .grants { + margin-top: 40px; + .dates { + margin-top: 0; + } + min-height: 425px; + img { + width: 60%; + margin: 0 auto; + } + a { + width: 50%; + margin-left: 25%; + } + } + + } + .build-slide { + h1 { + font-size: 24px; + } + p { + font-size: 20px; + margin-bottom: 0; + } + } + +} diff --git a/app/assets/v2/scss/lib/bootstrap/_navbar.scss b/app/assets/v2/scss/lib/bootstrap/_navbar.scss index cf5b667908a..b007b1cefab 100644 --- a/app/assets/v2/scss/lib/bootstrap/_navbar.scss +++ b/app/assets/v2/scss/lib/bootstrap/_navbar.scss @@ -120,7 +120,7 @@ @include font-size($navbar-toggler-font-size); line-height: 1; background-color: transparent; // remove default button style - border: $border-width solid transparent; // remove default button style + border: none; // remove default button style @include border-radius($navbar-toggler-border-radius); @include hover-focus() { @@ -132,8 +132,8 @@ // or image file as needed. .navbar-toggler-icon { display: inline-block; - width: 1.5em; - height: 1.5em; + width: 1.3em; + height: 1.3em; vertical-align: middle; content: ""; background: 50% / 100% 100% no-repeat; diff --git a/app/assets/v2/scss/top-nav.scss b/app/assets/v2/scss/top-nav.scss index 2aee1f0f3e3..c878c62c72a 100644 --- a/app/assets/v2/scss/top-nav.scss +++ b/app/assets/v2/scss/top-nav.scss @@ -1,8 +1,8 @@ // SVGs for mobile nav html { - --navbar-toggle-open: url("data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20width='30'%20height='30'%20viewBox='0%200%2030%2030'%3E%3Cpath%20stroke='currentColor'%20stroke-linecap='round'%20stroke-miterlimit='10'%20stroke-width='2'%20d='M4%207h22M4%2015h22M4%2023h22'%20/%3E%3C/svg%3E"); - --navbar-toggle-close: url("data:image/svg+xml,%3Csvg%20width='30px'%20height='30px'%20viewBox='0%200%2030%2030'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%20id='Page-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3E%3Cg%20id='Artboard'%20transform='translate(-146.000000,%20-156.000000)'%20fill-rule='nonzero'%3E%3Cg%20id='download'%20transform='translate(77.000000,%2045.000000)'%3E%3Cpath%20d='M73,118%20L95,134%20M73,134%20L95,118'%20id='Shape-Copy-2'%20stroke='currentColor'%20stroke-width='2'%20stroke-linecap='round'%3E%3C/path%3E%3Crect%20id='Path'%20x='69'%20y='111'%20width='30'%20height='30'%3E%3C/rect%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + --navbar-toggle-open: url("data:image/svg+xml,%3csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath fill-rule='evenodd' clip-rule='evenodd' d='M3 8V6H21V8H3ZM3 13H21V11H3V13ZM3 18H21V16H3V18Z' fill='black'/%3e%3c/svg%3e"); + --navbar-toggle-close: url("data:image/svg+xml,%3csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z' fill='black'/%3e%3c/svg%3e"); } .top-nav { diff --git a/app/grants/templates/grants/detail/_index.html b/app/grants/templates/grants/detail/_index.html index 379b6bd746c..0636c6cc9dd 100644 --- a/app/grants/templates/grants/detail/_index.html +++ b/app/grants/templates/grants/detail/_index.html @@ -137,7 +137,7 @@

- Back to [[backLink.title]] + Back to Grants
diff --git a/app/grants/templates/grants/landing/active_clr_round.html b/app/grants/templates/grants/landing/active_clr_round.html index 3f981acf30d..725a7b9a0a0 100644 --- a/app/grants/templates/grants/landing/active_clr_round.html +++ b/app/grants/templates/grants/landing/active_clr_round.html @@ -21,40 +21,6 @@

Discover Match Rounds

{% include 'grants/landing/round_by_type.html' with active_rounds=active_ecosystem_rounds %} {% endif %} - {# Hard-coding the Gitcoin Building Gitcoin mini banner ... #} -
- -
-
-
-
-

GR12 - GITCOIN BUILDING GITCOIN

- -
-
-

$25K -

available -

-
- - -
-

- Main: Decentralized projects building for Gitcoin -

-
-
- diff --git a/app/retail/templates/home/index2021.html b/app/retail/templates/home/index2021.html index 596004a0d19..47560183df7 100644 --- a/app/retail/templates/home/index2021.html +++ b/app/retail/templates/home/index2021.html @@ -34,7 +34,6 @@ .grad { --grad: 280deg; width: 100%; - padding: 4em 0; will-change: background; background: radial-gradient(78.19% 34.75% at 90.21% 104.67%, #FFFFFF 54.6%, rgba(255, 255, 255, 0) 100%), radial-gradient(65.42% 69.3% at 47.67% 83.08%, #FFFFFF 0%, #FFFFFF 50.74%, rgba(255, 255, 255, 0) 100%), radial-gradient(31.85% 86.5% at 3.3% 92.42%, #FFFFFF 42.79%, rgba(255, 255, 255, 0) 100%), conic-gradient(from var(--grad) at 50% 50%, #FFE4EE -39.94deg, #FCF1C2 7.54deg, rgba(251, 235, 181, 0.65) 39.37deg, #DEBEE3 129.16deg, #DAD1FF 176.25deg, #DCD2FE 233.58deg, #FFE4EE 320.06deg, #FCF1C2 367.54deg); @@ -129,21 +128,40 @@
{% include 'home/nav.html' %}
- -
-
-
-
-

Build and Fund the Open Web Together

-

Connect with the community developing digital public goods, creating financial freedom, and defining the future of the open web.

+
+