Skip to content

Commit

Permalink
Merge pull request #34 from GSA/version-update-test-Jan30
Browse files Browse the repository at this point in the history
Version update test jan30
  • Loading branch information
yogitabholwankar authored Jan 31, 2025
2 parents d93a9b4 + 6931a42 commit 7d746f6
Show file tree
Hide file tree
Showing 15 changed files with 6,308 additions and 5,180 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Install node.js.
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '20.10.0'

- name: Install NPM dependencies.
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.1.6
9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
source "https://rubygems.org"
ruby '>= 2.7.4'
ruby '3.1.6'

gem "jekyll", "~> 4.0"
gem "jekyll", "~> 4.3.3"
gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
gem "autoprefixer-rails"
gem "webrick"

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', git: "https://github.com/envygeeks/jekyll-assets"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?

gem "html-proofer", "~> 3.18"
gem "html-proofer", "~> 3.18"
149 changes: 67 additions & 82 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,153 +1,138 @@
GIT
remote: https://github.com/envygeeks/jekyll-assets
revision: 056d2c88719ef3b1f90967a606dd1441581dd832
specs:
jekyll-assets (4.0.0.alpha)
activesupport (>= 5, < 7)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 5.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (>= 1, < 3)
nokogiri (~> 1.10)
pathutil (~> 0.16)
sassc (>= 1.11, < 3.0)
sprockets (~> 4.0.beta7)

GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
autoprefixer-rails (10.4.2.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
autoprefixer-rails (10.4.19.0)
execjs (~> 2)
bigdecimal (3.1.9)
colorator (1.1.0)
concurrent-ruby (1.1.9)
concurrent-ruby (1.3.5)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x86-mingw32)
execjs (2.7.0)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.2.6)
ffi (1.15.5)
ffi (1.17.1)
ffi (1.17.1-x86-mingw32)
ffi (1.17.1-x86_64-linux-gnu)
forwardable-extended (2.6.0)
html-proofer (3.19.3)
google-protobuf (4.29.3)
bigdecimal
rake (>= 13)
google-protobuf (4.29.3-x86-mingw32)
bigdecimal
rake (>= 13)
google-protobuf (4.29.3-x86_64-linux)
bigdecimal
rake (>= 13)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogiri (~> 1.12)
parallel (~> 1.3)
nokogiri (~> 1.13)
parallel (~> 1.10)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.8.0)
i18n (1.10.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
jekyll (4.2.1)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
jekyll-feed (0.16.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.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 (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
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)
rexml
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
liquid-tag-parser (2.0.2)
extras (~> 0.3)
liquid (>= 3.0, < 5.0)
listen (3.7.1)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.7.1)
minitest (5.15.0)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
mini_portile2 (2.8.8)
nokogiri (1.18.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.21.0)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
parallel (1.26.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
racc (1.6.0)
rack (2.2.3)
public_suffix (6.0.1)
racc (1.8.1)
rainbow (3.1.1)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.28.0)
rexml (3.4.0)
rouge (4.5.1)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.0)
sass-embedded (1.83.4)
google-protobuf (~> 4.29)
rake (>= 13)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (1.8.0)
tzinfo-data (1.2025.1)
tzinfo (>= 1.0.0)
unicode-display_width (2.6.0)
webrick (1.9.1)
yell (2.2.2)
zeitwerk (2.5.4)

PLATFORMS
ruby
x86-mingw32
x86_64-linux

DEPENDENCIES
autoprefixer-rails
execjs (= 2.7.0)
html-proofer (~> 3.18)
jekyll (~> 4.0)
jekyll-assets!
jekyll (~> 4.3.3)
jekyll-feed (~> 0.15)
jekyll-paginate-v2 (= 3.0.0)
jekyll-redirect-from
jekyll-seo-tag
jekyll-sitemap
tzinfo-data
webrick

RUBY VERSION
ruby 2.7.4p191
ruby 3.1.6p260

BUNDLED WITH
2.1.4
2.3.27
4 changes: 1 addition & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<div class="grid-row padding-3">
<div class="tablet:grid-col">
<div class="logo-links">
<a class="footer-logo media_link" href="https://18f.gsa.gov">
{% asset img/logo-img.png width="50" alt="Agency logo" %}
</a>
<a class="footer-logo media_link" href="https://18f.gsa.gov"> </a>
</div>
</div>
<div class="tablet:grid-col"></div>
Expand Down
16 changes: 2 additions & 14 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{% comment %}
This appears at the top of the page letting the user know it's an
official government website
{% endcomment %}

<div class="page-landing-page layout-demo ">
<div class="page-landing-page layout-demo">
<a class="usa-skipnav" href="#main-content">Skip to main content</a>
<div class="usa-banner">
<div class="usa-accordion">
Expand All @@ -13,10 +8,7 @@
class="usa-banner__header"
>
<div class="usa-banner__inner">
<div class="grid-col-auto">
{% asset img/us_flag_small.png class="usa-banner__header-flag"
alt="U.S. flag" %}
</div>
<div class="grid-col-auto"></div>
<div class="grid-col-fill tablet:grid-col-auto">
<p class="usa-banner__header-text">
An official website of the United States government
Expand All @@ -37,8 +29,6 @@
<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 img/icon-dot-gov.svg class="usa-banner__icon
usa-media-block__img" alt="Dot gov" %}
<div class="usa-media-block__body">
<p>
<strong>The .gov means it’s official.</strong>
Expand All @@ -50,8 +40,6 @@
</div>
</div>
<div class="usa-banner__guidance tablet:grid-col-6">
{% asset img/icon-https.svg class="usa-banner__icon
usa-media-block__img" alt="Https" %}
<div class="usa-media-block__body">
<p>
<strong>The site is secure.</strong>
Expand Down
63 changes: 0 additions & 63 deletions _includes/highlights.html
Original file line number Diff line number Diff line change
@@ -1,63 +0,0 @@
{% comment %}
Use this section to highlight key elements of your site. Some
sites will only have two while others may have six to eight.
{% endcomment %}

<section class="usa-graphic-list usa-section usa-section--dark">
<div class="grid-container">
<div class="usa-graphic-list__row grid-row grid-gap">
<div class="usa-media-block tablet:grid-col">
{% asset img/circle-124.png class="usa-media-block__img" alt="Alt text"
%}
<div class="usa-media-block__body">
<h3 class="usa-graphic-list__heading">Graphic headings can vary.</h3>
<p>
Graphic headings can be used a few different ways, depending on what
your landing page is for. Highlight your values, specific program
areas, or results.
</p>
</div>
</div>
<div class="usa-media-block tablet:grid-col">
{% asset img/circle-124.png class="usa-media-block__img" alt="Alt text"
%}
<div class="usa-media-block__body">
<h3 class="usa-graphic-list__heading">Stick to 6 or fewer words.</h3>
<p>
Keep body text to about 30 words. They can be shorter, but try to be
somewhat balanced across all four. It creates a clean appearance
with good spacing.
</p>
</div>
</div>
</div>
<div class="usa-graphic-list__row grid-row grid-gap">
<div class="usa-media-block tablet:grid-col">
{% asset img/circle-124.png class="usa-media-block__img" alt="Alt text"
%}
<div class="usa-media-block__body">
<h3 class="usa-graphic-list__heading">
Never highlight anything without a goal.
</h3>
<p>
For anything you want to highlight here, understand what your users
know now, and what activity or impression you want from them after
they see it.
</p>
</div>
</div>
<div class="usa-media-block tablet:grid-col">
{% asset img/circle-124.png class="usa-media-block__img" alt="Alt text"
%}
<div class="usa-media-block__body">
<h3 class="usa-graphic-list__heading">Could also have 2 or 6.</h3>
<p>
In addition to your goal, find out your users’ goals. What do they
want to know or do that supports your mission? Use these headings to
show those.
</p>
</div>
</div>
</div>
</div>
</section>
Loading

0 comments on commit 7d746f6

Please sign in to comment.