Skip to content

Commit

Permalink
Merge pull request #2116 from GSA/staging
Browse files Browse the repository at this point in the history
Undoing SRI, removing S3 reference
  • Loading branch information
jdonis authored Dec 31, 2024
2 parents a54f733 + c607703 commit 9d4fafa
Show file tree
Hide file tree
Showing 29 changed files with 353 additions and 398 deletions.
22 changes: 10 additions & 12 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,23 @@
<!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
<script id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap_agency}}"></script>
{% if site.branch == "production" %}
<link rel="stylesheet" href="https://portal.challenge.gov/css/public.css" integrity="sha384-U3FAM/KmpWpDIC9LvHTiN5MfVf9HnN8i0pKD4IvBnzxfTSVlbqCLSUx1MQwjYkov" crossorigin="anonymous">
<script src="https://portal.challenge.gov/js/public.js" integrity="sha384-EadIINJfyK5WjX2xpy9sbX/YPYG7toOOYJVp1gS0Lwmun/DVJ3udFIqyS5rBQJDt" crossorigin="anonymous"></script>
<script src="https://portal.challenge.gov/js/client.js" integrity="sha384-J11hCQC6+esHSrCiCMdMesm2fLHifDXWYhx3Yq++Ox67dkUGWTJeXGWlbdTAgd7a" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://portal.challenge.gov/css/public.css" crossorigin="anonymous">
<script src="https://portal.challenge.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://portal.challenge.gov/js/client.js" crossorigin="anonymous"></script>
{% elsif site.branch == "staging" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" integrity="sha384-U3FAM/KmpWpDIC9LvHTiN5MfVf9HnN8i0pKD4IvBnzxfTSVlbqCLSUx1MQwjYkov" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" integrity="sha384-EadIINJfyK5WjX2xpy9sbX/YPYG7toOOYJVp1gS0Lwmun/DVJ3udFIqyS5rBQJDt" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" integrity="sha384-2H5+GtVkVnbdZ8eOn+Ae6gpnADKDtm73dRVqjQmgZlYZ4Wx50fZS2lRqeNo8pq4Y" crossorigin="anonymous"></script>
{% elsif site.branch == "dev" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>{% elsif site.branch == "dev" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" integrity="sha384-EadIINJfyK5WjX2xpy9sbX/YPYG7toOOYJVp1gS0Lwmun/DVJ3udFIqyS5rBQJDt" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" integrity="sha384-2H5+GtVkVnbdZ8eOn+Ae6gpnADKDtm73dRVqjQmgZlYZ4Wx50fZS2lRqeNo8pq4Y" crossorigin="anonymous"></script>
{% elsif jekyll.environment == "dev" %}
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>{% elsif jekyll.environment == "dev" %}
<link rel="stylesheet" href="http://localhost:4000/css/public.css" crossorigin="anonymous">
<script src="http://localhost:4000/js/public.js"></script>
<script src="http://localhost:4000/js/client.js"></script>
{% else %}
<link rel="stylesheet" href="https://challenge-portal-dev.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-dev.app.cloud.gov/js/public.js" integrity="sha384-ftiQihfu16XPU9p/A7Q14SYrPout4fCgSJ5ikgKf2MPk4tbCNvmqBAVyTQG5//Mb" crossorigin="anonymous"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/client.js" integrity="sha384-y+/LgZ9pTFrdlYvopf1yFjGmXJm3HhUTeQ+pNWtokc/ILrXgmfKtiw5dGjYA29f0" crossorigin="anonymous"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>
{% endif %}
<script>
// Explore challenges button scroll to active challenges section of react app
Expand Down
212 changes: 119 additions & 93 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,105 +1,131 @@
<!DOCTYPE html>
<!DOCTYPE html>
<!--[if lt IE 9]>
<html class="lt-ie9">
<![endif]-->
<!--[if gt IE 8]>
<!-->
<html lang="en">
<!--
<html lang="en">
<!--
<![endif]-->
<head>
<!-- Basic Page Needs

<head>
<!-- Basic Page Needs
================================================== -->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Mobile Specific Metas
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Mobile Specific Metas
================================================== -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Title and meta description
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Title and meta description
================================================== -->
<title>{% if page.challenge-title %}{{ page.challenge-title }} | {{ site.title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}</title> {% if site.branch != "production" %}
<meta name="robots" content="noindex, nofollow"> {% endif %}
<meta name="description" content="{{site.description}}">
<meta property="og:title" content="{% if page.challenge-title %}{{ page.challenge-title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}">
<meta property="og:description" content="{% if page.tagline %}{{ page.tagline }}{% else %}{{ site.description }}{% endif %}">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@{site.twitter}">
<meta name="keywords" content="{{site.keywords}}">
<meta property="og:image" content="{% if page.card-image %}{{ page.card-image | prepend: site.baseurl | prepend: site.url }}{% else %}{{ site.feature_image | prepend: site.baseurl | prepend: site.url }}{% endif %}">
<meta name="twitter:image" content="{% if page.card-image %}{{ page.card-image | prepend: site.baseurl | prepend: site.url }}{% else %}{{ site.feature_image | prepend: site.baseurl | prepend: site.url }}{% endif %}">
<meta property="og:type" content="article">
<link rel="canonical" data-hr="true" href="{{site.baseurl}}/">
<meta property="og:url" data-hr="true" content="{{site.baseurl}}/">
<!-- Favicons
<title>{% if page.challenge-title %}{{ page.challenge-title }} | {{ site.title }}{% elsif page.title %}{{ page.title
}} | {{ site.title }}{% else %}{{ site.title }}{% endif %}</title> {% if site.branch != "production" %}
<meta name="robots" content="noindex, nofollow"> {% endif %}
<meta name="description" content="{{site.description}}">
<meta property="og:title"
content="{% if page.challenge-title %}{{ page.challenge-title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}">
<meta property="og:description"
content="{% if page.tagline %}{{ page.tagline }}{% else %}{{ site.description }}{% endif %}">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@{site.twitter}">
<meta name="keywords" content="{{site.keywords}}">
<meta property="og:image"
content="{% if page.card-image %}{{ page.card-image | prepend: site.baseurl | prepend: site.url }}{% else %}{{ site.feature_image | prepend: site.baseurl | prepend: site.url }}{% endif %}">
<meta name="twitter:image"
content="{% if page.card-image %}{{ page.card-image | prepend: site.baseurl | prepend: site.url }}{% else %}{{ site.feature_image | prepend: site.baseurl | prepend: site.url }}{% endif %}">
<meta property="og:type" content="article">
<link rel="canonical" data-hr="true" href="{{site.baseurl}}/">
<meta property="og:url" data-hr="true" content="{{site.baseurl}}/">
<!-- Favicons
================================================== -->
<!-- 128x128 -->
<link rel="shortcut icon" type="image/ico" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<link rel="icon" type="image/png" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 192x192, as recommended for Android -->
<link rel="icon" type="image/png" sizes="192x192" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
<link rel="apple-touch-icon-precomposed" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- CSS
<!-- 128x128 -->
<link rel="shortcut icon" type="image/ico" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<link rel="icon" type="image/png" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 192x192, as recommended for Android -->
<link rel="icon" type="image/png" sizes="192x192" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
<link rel="apple-touch-icon-precomposed" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{site.baseurl}}/assets/uswds/img/us_flag_small.png">
<!-- CSS
================================================== -->
<!-- env: demo -->
<link rel="stylesheet" href="{{site.baseurl}}/assets/uswds/css/uswds.css">
<link rel="stylesheet" href="{{site.baseurl}}/assets/styles/styles.css">
</head>
<body>
<!-- env: demo -->
<link rel="stylesheet" href="{{site.baseurl}}/assets/uswds/css/uswds.css">
<link rel="stylesheet" href="{{site.baseurl}}/assets/styles/styles.css">
<!-- Google Tag Manager #2095
<script>(function (w, d, s, l, i) {
w[l] = w[l] || []; w[l].push({
'gtm.start':
new Date().getTime(), event: 'gtm.js'
}); var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-WWWW53NN');</script>
End Google Tag Manager -->

</head>

<a class="usa-skipnav" href="#main-content">Skip to main content</a>
<div class="field field--name-body field--type-text-with-summary field--label-hidden field__item">
<section class="usa-banner" aria-label="USA banner area">
<div class="usa-banner">
<div class="usa-accordion">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="grid-col-auto">
<img class="usa-banner__header-flag" src="{{site.baseurl}}/assets/uswds/img/us_flag_small.png" alt="U.S. flag">
</div>
<div class="grid-col-fill tablet:grid-col-auto">
<p class="usa-banner__header-text">An official website of the United States government</p>
<p class="usa-banner__header-action" aria-hidden="true">Here’s how you know</p>
</div>
<button class="usa-accordion__button usa-banner__button" aria-expanded="false" aria-controls="gov-banner">
<span class="usa-banner__button-text">Here's how you know</span>
</button>
</div>
</header>
<div class="usa-banner__content usa-accordion__content" id="gov-banner">
<div class="grid-row grid-gap-lg">
<div class="usa-banner__guidance tablet:grid-col-6">
<img class="usa-banner__icon usa-media-block__img" src="{{site.baseurl}}/assets/uswds/img/icon-dot-gov.svg" alt="Dot gov">
<div class="usa-media-block__body">
<p>
<strong>The .gov means it’s official.</strong>
<br>
Federal government websites often end in .gov or .mil. Before sharing sensitive information, make sure you’re on a federal government site.
</p>
</div>
</div>
<div class="usa-banner__guidance tablet:grid-col-6">
<img class="usa-banner__icon usa-media-block__img" src="{{site.baseurl}}/assets/uswds/img/icon-https.svg" alt="Https">
<div class="usa-media-block__body">
<p>
<strong>The site is secure.</strong>
<br>
The <strong>https://</strong> ensures that you are connecting to the official website and that any information you provide is encrypted and transmitted securely.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div class="usa-overlay"></div>
<body>
<!-- Google Tag Manager (noscript) #2095
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WWWW53NN" height="0" width="0"
style="display:none;visibility:hidden"></iframe></noscript>
End Google Tag Manager (noscript) -->
<a class="usa-skipnav" href="#main-content">Skip to main content</a>
<div class="field field--name-body field--type-text-with-summary field--label-hidden field__item">
<section class="usa-banner" aria-label="USA banner area">
<div class="usa-banner">
<div class="usa-accordion">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="grid-col-auto">
<img class="usa-banner__header-flag" src="{{site.baseurl}}/assets/uswds/img/us_flag_small.png"
alt="U.S. flag">
</div>
<div class="grid-col-fill tablet:grid-col-auto">
<p class="usa-banner__header-text">An official website of the United States government</p>
<p class="usa-banner__header-action" aria-hidden="true">Here’s how you know</p>
</div>
<button class="usa-accordion__button usa-banner__button" aria-expanded="false" aria-controls="gov-banner">
<span class="usa-banner__button-text">Here's how you know</span>
</button>
</div>
</header>
<div class="usa-banner__content usa-accordion__content" id="gov-banner">
<div class="grid-row grid-gap-lg">
<div class="usa-banner__guidance tablet:grid-col-6">
<img class="usa-banner__icon usa-media-block__img"
src="{{site.baseurl}}/assets/uswds/img/icon-dot-gov.svg" alt="Dot gov">
<div class="usa-media-block__body">
<p>
<strong>The .gov means it’s official.</strong>
<br>
Federal government websites often end in .gov or .mil. Before sharing sensitive information, make
sure you’re on a federal government site.
</p>
</div>
</div>
<div class="usa-banner__guidance tablet:grid-col-6">
<img class="usa-banner__icon usa-media-block__img"
src="{{site.baseurl}}/assets/uswds/img/icon-https.svg" alt="Https">
<div class="usa-media-block__body">
<p>
<strong>The site is secure.</strong>
<br>
The <strong>https://</strong> ensures that you are connecting to the official website and that any
information you provide is encrypted and transmitted securely.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div class="usa-overlay"></div>
Loading

0 comments on commit 9d4fafa

Please sign in to comment.