Skip to content

Commit

Permalink
Merge pull request #97 from GSA/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
HarikaMunipalle authored Nov 22, 2023
2 parents 9b5853d + 216bd0c commit 16f97b4
Show file tree
Hide file tree
Showing 19 changed files with 10,601 additions and 4,647 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ _site
node_modules
.bundle
.jekyll-cache/
Gemfile.lock
.DS_Store
assets/img
assets/fonts
assets/js/uswds.js
assets/js/uswds.min.js
assets/js/uswds.min.js.map
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
3.1.3
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6.6
FROM ruby:3.1.3

RUN apt-get update && \
apt-get install --reinstall -y locales && \
Expand Down
10 changes: 3 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
ruby '>= 2.6.6'
ruby '>= 3.1.3'

source "https://rubygems.org"

gem "jekyll", "~> 3.9"

# See https://github.com/envygeeks/jekyll-assets/issues/622
gem "jekyll", "4.2.2"
gem "webrick"
gem "sprockets", "~> 3.7"
gem "kramdown-parser-gfm", "~> 1.1.0"

group :jekyll_plugins do
gem "jekyll-feed", "~> 0.15"
gem 'jekyll-redirect-from'
gem 'jekyll-paginate-v2', "3.0.0"
gem 'jekyll-sitemap'
gem 'jekyll-seo-tag'
gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
137 changes: 53 additions & 84 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,144 +1,113 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.8)
em-websocket (0.5.2)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.14.0)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.8.1)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.2.3)
ffi (1.15.0)
ffi (1.16.3-x64-mingw-ucrt)
forwardable-extended (2.6.0)
html-proofer (3.19.1)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
parallel (~> 1.3)
nokogiri (~> 1.13)
parallel (~> 1.10)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (3.9.1)
jekyll (4.2.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
mercenary (~> 0.4.0)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-assets (3.0.12)
activesupport (~> 5.0)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 4.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (~> 1.0)
nokogiri (~> 1.8)
pathutil (~> 0.16)
sprockets (>= 3.3, < 4.1.beta)
jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
terminal-table (~> 2.0)
jekyll-paginate-v2 (3.0.0)
jekyll (>= 3.0, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sanity (1.6.0)
jekyll (>= 3.1, < 5.0)
pathutil (~> 0.16)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.7.1)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
liquid-tag-parser (1.9.0)
extras (~> 0.3)
liquid (>= 3.0, < 5.0)
listen (3.5.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.5.1)
minitest (5.14.4)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
mercenary (0.4.0)
nokogiri (1.15.4-x64-mingw-ucrt)
racc (~> 1.4)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.20.1)
parallel (1.23.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3)
rainbow (3.0.0)
rb-fsevent (0.11.0)
public_suffix (5.0.3)
racc (1.7.3)
rack (2.2.8)
rainbow (3.1.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.26.0)
rexml (3.2.6)
rouge (3.30.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.4.0)
ffi (~> 1.9)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
thread_safe (0.3.6)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unicode-display_width (1.8.0)
wdm (0.1.1)
webrick (1.8.1)
yell (2.2.2)

PLATFORMS
ruby
x64-mingw-ucrt

DEPENDENCIES
html-proofer (~> 3.18)
jekyll (~> 3.9)
jekyll-assets (~> 3.0)
jekyll-feed (~> 0.15)
jekyll (= 4.2.2)
jekyll-paginate-v2 (= 3.0.0)
jekyll-redirect-from
jekyll-seo-tag
jekyll-sitemap
kramdown-parser-gfm (~> 1.1.0)
sprockets (~> 3.7)
tzinfo-data
wdm (~> 0.1.0)
webrick

RUBY VERSION
ruby 2.6.6p146
ruby 3.1.4p223

BUNDLED WITH
1.17.2
2.4.21
41 changes: 15 additions & 26 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,7 @@ permalink: pretty

markdown: kramdown
plugins:
- jekyll-feed
- jekyll-paginate-v2
- jekyll-redirect-from
- jekyll-sitemap # See additional instructions for url parameter above.
- jekyll-seo-tag

Expand Down Expand Up @@ -250,27 +248,18 @@ exclude:
- Gemfile
- Gemfile.lock

assets:
digest: false
autoprefixer:
browsers:
- "> 2%"
- "last 2 versions"
- "IE 11"
- "not dead"
compression: true
sources:
- node_modules/uswds/dist
- node_modules/uswds/dist/img
- node_modules/uswds/dist/js
- node_modules/uswds/dist/scss
- node_modules/netlify-cms/dist
- _assets/img
- _assets/js
- _assets/css
defaults:
js: { integrity: false }
css: { integrity: false }
img: { integrity: false }
features:
integrity: false
autoprefixer:
browsers:
- "> 2%"
- "last 2 versions"
- "IE 11"
- "not dead"

sass:
sass_dir: _sass
load_paths:
- node_modules/uswds/dist/
sourcemap: development
quiet_deps: true
style: compressed
verbose: true
6 changes: 3 additions & 3 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<section id="gov-banner-header-section" aria-label="USA Gov banner section header" class="usa-banner__header">
<div class="usa-banner__inner">
<div class="grid-col-auto">
{% asset us_flag_small.png class="usa-banner__header-flag" alt="U.S. flag" %}
<img class="usa-banner__header-flag" alt="U.S. flag" src="{{ site.baseurl }}/assets/img/us_flag_small.png">
</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>
Expand All @@ -28,7 +28,7 @@
<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">
{% asset icon-dot-gov.svg class="usa-banner__icon usa-media-block__img" alt="Dot gov" %}
<img class="usa-banner__icon usa-media-block__img" alt="Dot gov" src="{{ site.baseurl }}/assets/img/icon-dot-gov.svg">
<div class="usa-media-block__body">
<p>
<strong>The .gov means it’s official.</strong>
Expand All @@ -39,7 +39,7 @@
</div>
</div>
<div class="usa-banner__guidance tablet:grid-col-6">
{% asset icon-https.svg class="usa-banner__icon usa-media-block__img" alt="Https" %}
<img class="usa-banner__icon usa-media-block__img" alt="Https" src="{{ site.baseurl }}/assets/img/icon-https.svg">
<div class="usa-media-block__body">
<p>
<strong>The site is secure.</strong>
Expand Down
2 changes: 1 addition & 1 deletion _includes/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
>
<div class="usa-nav__inner">
<button class="usa-nav__close">
{% asset close.svg alt="close" %}
<img alt="close" src="{{ site.baseurl }}/assets/img/close.svg"/>
</button>
<ul class="usa-nav__primary usa-accordion">
{% for nav_item in include.primary_navigation %} {% unless
Expand Down
28 changes: 20 additions & 8 deletions _includes/meta.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,32 @@
<meta name="description" content="{{site.description}}">
<meta property="og:description" content="{{site.description}}">

<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@{{site.twitter}}" />
<meta name="twitter:title" content="{{site.title}}" />
<meta name="twitter:description" content="{{site.description}}" />
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@{{site.twitter}}" />
<meta name="twitter:title" content="{{site.title}}" />
<meta name="twitter:description" content="{{site.description}}" />

<meta property="og:type" content="article">
<link rel="canonical" href="{{ page.url | absolute_url }}" />
<meta property="og:url" content="{{ page.url | absolute_url }}" />
<!-- Favicons
================================================== -->
<!-- 128x128 -->
<link rel="shortcut icon" type="image/ico" href="{{ site.baseurl }}/assets/img/favicon.ico">
<link rel="icon" type="image/png" href="{{ site.baseurl }}/assets/img/favicon.png">
<link rel="shortcut icon" type="image/ico" href="{{site.baseurl}}/assets/img/favicon.ico">
<link rel="icon" type="image/png" href="{{site.baseurl}}/assets/img/favicon.png">
<!-- 192x192, as recommended for Android
http://updates.html5rocks.com/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
-->
<link rel="icon" type="image/png" sizes="192x192" href="{{site.baseurl}}/assets/img/favicons/favicon-192.png">
<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
<link rel="apple-touch-icon-precomposed" href="{{site.baseurl}}/assets/img/favicons/favicon-57.png">
<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{site.baseurl}}/assets/img/favicons/favicon-72.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/img/favicons/favicon-114.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{site.baseurl}}/assets/img/favicons/favicon-144.png">
<!-- CSS
================================================== -->
{% asset index.scss %}
</head>
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/index.css?{{ site.time | date: '%s%N' }}">
</head>
10 changes: 4 additions & 6 deletions _includes/scripts.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
{% if site.dap.agency %}
<script
id="_fed_an_ua_tag"
src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap.agency}}{% if site.dap.subagency %}&subagency={{site.dap.subagency}}{% endif %}"
></script>
<script id="_fed_an_ua_tag"
src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap.agency}}{% if site.dap.subagency %}&subagency={{site.dap.subagency}}{% endif %}"></script>
{% endif %}

<script type="text/javascript">
Expand Down Expand Up @@ -34,5 +32,5 @@
</script>
{% endif %}

{% asset uswds.min.js %}
{% asset app.js %}
<script src="{{ site.baseurl }}/assets/js/uswds.min.js?{{ site.time | date: '%s%N' }}"></script>
<script src="{{ site.baseurl }}/assets/js/app.js?{{ site.time | date: '%s%N' }}"></script>
Loading

0 comments on commit 16f97b4

Please sign in to comment.