Skip to content

Commit

Permalink
Chal-1003
Browse files Browse the repository at this point in the history
  • Loading branch information
morrisjosephd committed Jul 13, 2022
1 parent 1dcc7e1 commit aada012
Show file tree
Hide file tree
Showing 29 changed files with 1,709 additions and 75 deletions.
11 changes: 11 additions & 0 deletions _includes/challenges-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="challenges-bg challenges-header challenges">
<div class="grid-row">
<div class="container">
<div class="tablet:grid-col">
<h2 class="text-white">Find a Challenge</h2>
<h5 class="challenge-banner-text">Browse through challenges and submit your ideas for a chance to win.</h5>
</div>
<div class="tablet:grid-col"></div>
</div>
</div>
</div>
26 changes: 16 additions & 10 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<div class="grid-container padding-top-15 padding-bottom-5" >
<div class="grid-row">
<div class="tablet:grid-col footer__left">
<img class="height-5 margin-bottom-2" src="{{ site.baseurl }}/assets/images/agency/challenge-logo-white.svg" alt="Challenge Gov Logo" title="Challenge Gov" >
<hr class="border-white margin-bottom-5" />
<img class="height-5 margin-bottom-2" src="{{ site.baseurl }}/assets/images/agency/challenge-logo-white-orange.svg" alt="Challenge Gov Logo" title="Challenge Gov" >
<hr class="border-orange margin-bottom-5" />
<div class="grid-row">
<div class="tablet:grid-col">
<ul class="add-list-reset">
Expand All @@ -14,41 +14,45 @@
</div>
<div class="tablet:grid-col">
<ul class="add-list-reset">
<li class="margin-bottom-1"><a class="text-no-underline" href="{{ site.baseurl }}/assets/document-library/ChallengeGov_Federal_Agency_FAQ.pdf">Agency resources</a></li>
<li class="margin-bottom-1" id="js-archived-challenges"><a class="text-no-underline" href="{{ site.baseurl }}/?state=archived">Archived challenges</a></li>
<li class="margin-bottom-1"><a class="text-no-underline" href="{{ site.baseurl }}/assets/document-library/ChallengeGov_Federal_Agency_FAQ.pdf">Agency Resources</a></li>
<li class="margin-bottom-1" id="js-archived-challenges"><a class="text-no-underline" href="{{ site.baseurl }}/?state=archived">Archived Challenges</a></li>
</ul>
</div>
<div class="tablet:grid-col">
<ul class="add-list-reset">
<li class="margin-bottom-1"><a class="text-no-underline" href="{{ site.baseurl }}/terms">Terms</a></li>
<li class="margin-bottom-1"><a class="text-no-underline" href="{{ site.baseurl }}/privacy-policy">Privacy policy</a></li>
<li class="margin-bottom-1"><a class="text-no-underline" href="{{ site.baseurl }}/privacy-policy">Privacy Policy</a></li>
</ul>
</div>
<div class="tablet:grid-col">
<div class="grid-row usa-footer__social_links">
<a href="https://www.twitter.com/ChallengeGov" class="margin-right-2 usa-footer__social_link" target="_blank" rel="noopener">
<a href="https://www.twitter.com/ChallengeGov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
<a href="https://www.facebook.com/ChallengeGov" class="margin-right-2 usa-footer__social_link" target="_blank" rel="noopener">
<a href="https://www.facebook.com/ChallengeGov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener">
<i class="fab fa-facebook"></i>
</a>
<a href="https://www.linkedin.com/company/challengegov/" class="margin-right-2 usa-footer__social_link" target="_blank" rel="noopener">
<a href="https://www.linkedin.com/company/challengegov/" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener">
<i class="fab fa-linkedin-in"></i>
</a>
<a href="https://github.com/GSA/Challenge_gov" class="margin-right-2 usa-footer__social_link" target="_blank" rel="noopener">
<a href="https://github.com/GSA/Challenge_gov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
</a>
<a href="https://public.govdelivery.com/accounts/USGSATTS/signup/30826" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener">
<i class="fa fa-envelope" aria-hidden="true"></i>
</a>
</div>
</div>
</div>
</div>

<div class="tablet:grid-col-2 text-right">
<img src="{{ site.baseurl }}/assets/images/agency/challenge-logo-square-white.svg" alt="Challenge Gov Logo Square" title="Challenge Gov" class="height-10 footer__challenge-logo-square">
<img src="{{ site.baseurl }}/assets/images/agency/challenge-logo-square-white.svg" alt="GSA Logo Square" title="GSA logo" class="height-10 footer__gsa-logo-square">
</div>
</div>
</div>
</footer>
<a href="#" class="top">Back to Top ^</a>


<!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
Expand Down Expand Up @@ -123,9 +127,11 @@
ga('send', 'pageview');
</script>


<script src="{{site.baseurl}}/assets/uswds/js/uswds.min.js"></script>
<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
<script src="{{site.baseurl}}/assets/js/app.js"></script>
<script src="{{site.baseurl}}/assets/js/app.js"></script>

{% include searchgov/script.html affiliate=site.searchgov_affiliate %}

Expand Down
1 change: 1 addition & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@


<link rel="stylesheet" href="{{site.baseurl}}/assets/styles/styles.css">
<link rel="stylesheet" href="{{site.baseurl}}/assets/styles/style-2022.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">


Expand Down
58 changes: 12 additions & 46 deletions _includes/help-section.html
Original file line number Diff line number Diff line change
@@ -1,51 +1,17 @@
<div class="section-divider"></div>

<div class="help-section margin-bottom-5">
<div class="grid-container-resources help-section" id="resources-people">
<div class="grid-container">
<div class="grid-row margin-x-auto margin-bottom-5 help-section__header">
Are you a public innovator and need help getting started?
<div class="grid-row">
<div class="tablet:grid-col" style="text-align: center;">
<h2>Are you a<br>Public Innovator?</h2>
<div class="container"><img class="people responsive" src="{{ site.baseurl }}/assets/images/banners/orange-people.png" alt="Challenge Gov Public Innovator Resources" title="Challenge Gov" >
</div><a href="{{ site.baseurl }}/resources" class="usa-button usa-button--big" data-anchor="active-challenges">View Resources</a>
</div>

<div class="grid-row help-section__content">
<div class="tablet:grid-col display-flex flex-align-center help-section__block help-section__agency-toolkit">
<div class="help-section__icon-container">
<img src="{{ site.baseurl }}/assets/images/icons/tool_icon.svg"/>
</div>
<div class="help-section__button-container">
<p>Browse innovator resources.</p>
<a class="usa-button usa-button--big" href="{{ site.baseurl }}/resources">View resources</a>
</div>
</div>

<div class="tablet:grid-col display-flex flex-align-center help-section__block help-section__newsletter">
<div class="help-section__icon-container">
<img src="{{ site.baseurl }}/assets/images/icons/mail_icon.svg"/>
</div>
<div class="help-section__button-container">
<p>Subscribe to our newsletter to receive information about prize competitions.</p>
{% if site.branch == "master" %}
<a class="usa-button usa-button--big" href="https://public.govdelivery.com/accounts/USGSATTS/signup/30826">Subscribe</a>
{% elsif site.branch == "staging" %}
<a class="usa-button usa-button--big" href="https://public.govdelivery.com/accounts/USGSATTS/signup/30826">Subscribe</a>
{% elsif site.branch == "embed-react-app" %}
<a class="usa-button usa-button--big" href="https://stage-public.govdelivery.com/accounts/USGSATTS/signup/12360">Subscribe</a>
{% elsif site.branch == "" %}
<a class="usa-button usa-button--big" href="https://stage-public.govdelivery.com/accounts/USGSATTS/signup/12360">Subscribe</a>
{% else %}
<a class="usa-button usa-button--big" href="https://stage-public.govdelivery.com/accounts/USGSATTS/signup/12360">Subscribe</a>
{% endif %}
</div>
</div>

<div class="tablet:grid-col display-flex flex-align-center help-section__block help-section__create-account">
<div class="help-section__icon-container">
<img src="{{ site.baseurl }}/assets/images/icons/account_icon.svg"/>
</div>
<div class="help-section__button-container">
<p>Create an account to engage with a challenge.</p>
<a class="usa-button usa-button--big" href="https://portal.challenge.gov/sign-in/new">Create account</a>
</div>
</div>
<div class="tablet:grid-col" style="text-align: center;">
<h2 class="resources-title">Are you a<br>Federal Innovation Manager?</h2>
<div class="container"><img class="people responsive" src="{{ site.baseurl }}/assets/images/banners/blue-people.png" alt="Challenge Gov Federal Innovation Manager Recources" title="Challenge Gov" ></div>
<a class="usa-button usa-button--big" href="{{ site.baseurl }}/community">View Resources</a>
</div>

</div>
</div>
</div>
24 changes: 13 additions & 11 deletions _includes/hero.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<div class="usa-hero bg-base-lightest text-black display:flex flex-justify-center">
<div class="usa-hero__inner">
<div class="usa-hero__inner2">
<div class="grid-container">
<div class="grid-row flex-align-center">
<div class="tablet:grid-col usa-hero__description">
<h1>
Welcome to Challenge.Gov
</h1>
<p>
Here, members of the public can participate to help the U.S. government solve problems big and small.
</p>
<button id="js-explore-challenges" class="usa-button padding-2" data-anchor="active-challenges">Explore challenges</button>
<div class="display-flex flex-column flex-align-center">
<div class="hero-logo"><img style="height: 3.8rem;" class="margin-bottom-2" src="{{ site.baseurl }}/assets/images/agency/challenge-logo-white-orange.svg" alt="Challenge Gov Logo" title="Challenge Gov" >

</div>
<div class="display-flex flex-column flex-align-center usa-hero__description">
<h2 class="hero-headline" style="text-align: center;">Where <span style="color:#fa9441">public innovators</span> are inspired to meet challenges <span style="color:#fa9441">big</span> & <span style="color:#fa9441">small</span>.</h2>
<div class="grid-row">
<div class="grid-col-6"><button style="width: 15rem;" id="js-explore-challenges" class="usa-button usa-button" data-anchor="active-challenges">Find a Challenge</button> </div>
<div class="grid-col-6"><a href="https://secure.login.gov/sign_up/enter_email?request_id=6ab5f3e4-a3e5-4cb7-90a3-3a777fee8967"><button style="width: 15rem;" id="create-account-hero-button" class="hero-create usa-button usa-button" data-anchor="active-challenges">Create Account</button></a></div>
</div>

</div>
<div class="tablet:grid-col"></div>
</div>
</div>
</div>
</div>

12 changes: 12 additions & 0 deletions _includes/manager.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="section-divider-transparent"></div>


<div class="grid-row" style="background-color: #112f4e" "padding: 40px;">
<div class="tablet:grid-col"><h2 class="text-white">Are you a Challenge Manager?</h2><p class="text-white">Engage public solvers in prize
competitions and crowdsourcing.</p></div>
<div class="tablet:grid-col"></div>
<div class="tablet:grid-col"><a href="https://portal.challenge.gov/sign-in/new" class="usa-button usa-button--flexible-width" data-anchor="active-challenges">Get Started</a></div>
</div>


<div class="section-divider-transparent"></div>
11 changes: 6 additions & 5 deletions _includes/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
<a class="usa-nav__link" href="{{ site.baseurl }}/" title="Active challenges" aria-label="Active challenges">Active challenges</a>
<a href="{{ site.baseurl }}/#active-challenges" class="usa-nav__link" title="Active challenges" aria-label="Active challenges" data-anchor="active-challenges">Find a Challenge</a>
</li>
<li class="usa-nav__primary-item">
<a class="usa-nav__link" href="{{ site.baseurl }}/?state=archived" title="Archived challenges" aria-label="Archived challenges">Archived challenges</a>
<a class="usa-nav__link" href="{{ site.baseurl }}/#resources-people" title="Resources" aria-label="Resources">Resources</a>
</li>
<li class="usa-nav__primary-item">
<a class="usa-nav__link" href="{{ site.baseurl }}/contact" title="Contact us" aria-label="Contact us">Contact us</a>
<a class="usa-nav__link" href="{{ site.baseurl }}/contact" title="Contact" aria-label="Contact">Contact</a>
</li>
</ul>
{% include searchgov/form.html affiliate=site.searchgov_affiliate %}
<a class="float-right usa-button usa-button--outline tablet:margin-left-2 tablet:float-right font-sans-xs" href="https://portal.challenge.gov/sign-in/new">My account</a>
{% include searchgov/form.html affiliate=site.searchgov_affiliate %}
<a style="width: 6rem;" class="float-right usa-button usa-button--outline tablet:margin-left-2 tablet:float-right font-sans-xs" href="https://portal.challenge.gov/sign-in/new">Login</a>
<a style="width: 10rem;" class="float-right usa-button usa-button tablet:margin-left-1 tablet:float-right font-sans-xs" href="https://secure.login.gov/sign_up/enter_email?request_id=6ab5f3e4-a3e5-4cb7-90a3-3a777fee8967">Create Account</a>
</nav>
</div>
</header>
12 changes: 12 additions & 0 deletions _includes/newsletter.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="newsletter-bg newsletter">
<div class="grid-row">
<div class="container">
<div class="tablet:grid-col">
<h2 class="text-white">Stay Informed!</h2>
<h5 style="color: #ffffff">Stay up to date on the latest Challenge.Gov news!</h5>
<a href="https://public.govdelivery.com/accounts/USGSATTS/signup/30826" target="_blank" class="usa-button usa-button--big" data-anchor="active-challenges" style="color:#112f4e; background-color:#fa9441;">Subscribe</a>
</div>
<div class="tablet:grid-col"></div>
</div>
</div>
</div>
17 changes: 17 additions & 0 deletions _includes/video.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

<div class="grid-container-video video">
<div class="grid-container">
<div class="grid-row">
<div class="tablet:grid-col">
<div class="video-left">
<h2 class="learn-video">Learn how <span style="color:#fa9441;"><i>you</i></span> can participate and make a difference.</h2>
<hr style="height:4px; border:none; color:#fa9441; background-color:#fa9441; width:100%; text-align:center; margin: 10px 5px;">
<div class=".tablet:grid-col-12" style="padding-bottom: 50px;">
<div> <a href="https://www.twitter.com/ChallengeGov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener"> <i class="fab fa-twitter"></i> </a> <a href="https://www.facebook.com/ChallengeGov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener"> <i class="fab fa-facebook"></i> </a> <a href="https://www.linkedin.com/company/challengegov/" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener"> <i class="fab fa-linkedin-in"></i> </a> <a href="https://github.com/GSA/Challenge_gov" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener"> <i class="fab fa-github"></i> </a> <a href="https://public.govdelivery.com/accounts/USGSATTS/signup/30826" class="margin-right-1 usa-footer__social_link" target="_blank" rel="noopener"> <i class="fa fa-envelope" aria-hidden="true"></i> </a> </div>
</div>
</div>
</div>
<div class="video-embed tablet:grid-col"><img src="https://federalist-2c628203-05c2-48ab-8f87-3eda79380559.app.cloud.gov/preview/gsa/challenges-and-prizes/marni-chal-1003/assets/images/banners/video-placeholder.jpg"></div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
<div class="grid-container usa-section">
<div class="grid-row">
<div class="usa-layout-docs__main desktop:grid-col-9 usa-prose">
<div class="usa-layout-docs__main desktop:grid-col-12 usa-prose">
{{ content }}
</div>
</div>
Expand All @@ -12,4 +12,4 @@



<!-- <div class="grid-row padding-x-8 margin-bottom-4"> -->
<!-- <div class="grid-row padding-x-8 margin-bottom-4"> -->
Loading

0 comments on commit aada012

Please sign in to comment.