Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ecasogp uswds upgrade #436

Merged
merged 12 commits into from
Apr 2, 2024
Merged
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ruby '>= 3.1.3'

source "https://rubygems.org"

gem "jekyll", "~> 3.8" # pinned awaiting release of https://github.com/jekyll/jekyll/pull/9304
gem 'jekyll', '~> 4.3.3'
gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
gem "mini_racer"
gem "autoprefixer-rails"
Expand All @@ -15,7 +15,7 @@ gem "kramdown-parser-gfm"
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.15"
gem 'jekyll-redirect-from'
gem 'jekyll-paginate-v2', "3.0.0"
gem 'jekyll-paginate-v2', '~> 3.0'
gem 'jekyll-sitemap'
gem 'jekyll-seo-tag'
gem 'jekyll-autoprefixer'
Expand All @@ -28,3 +28,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "wdm", "~> 0.1.0" if Gem.win_platform?

gem "html-proofer", "~> 3.15"
gem 'jekyll-sass-converter', '~> 3.0'
6 changes: 2 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ pagination:
# Site-wide kill switch, disabled here it doesn't run at all
enabled: true
# Set to 'true' to enable pagination debugging. This can be enabled in the site config or only for individual pagination pages
debug: false
debug: true
# The default document collection to paginate if nothing is specified ('posts' is default)
collection: "posts"
# How many objects per paginated page, used to be `paginate` (default: 0, means all)
Expand Down Expand Up @@ -243,10 +243,8 @@ pagination:
after: 2
# Optional, the default file extension for generated pages (e.g html, json, xml).
# Internally this is set to html by default
extension: html
# Optional, the default name of the index file for generated pages (e.g. 'index.html')
# Without file extension
indexpage: "index.html"

exclude:
- package.json
Expand All @@ -272,7 +270,7 @@ autoprefixer:
sass:
sass_dir: _sass
load_paths:
- node_modules/uswds/dist/
- node_modules/@uswds/uswds/packages
sourcemap: development
quiet_deps: true
style: compressed
Expand Down
8 changes: 4 additions & 4 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ <h3 class="usa-footer__primary-link">Related Councils</h3>
<div class="usa-footer__secondary-section">
<div class="grid-container">
<div class="grid-row grid-gap">
<div class="usa-footer__logo grid-row mobile-lg:grid-col-9">
<div class="mobile-lg:grid-col-2">
<div class="usa-footer__logo grid-row mobile-lg:grid-col-6 mobile-lg:grid-gap-2">
<div class="mobile-lg:grid-col-auto">
<img class="usa-footer__logo-img" alt="Office of Management and Budget Logo" src="{{ site.baseurl }}/assets/images/logos/omb-logo.png">
</div>
<div class="mobile-lg:grid-col">
<div class="mobile-lg:grid-col-auto">
<strong>
Office of Management and Budget
</strong>
</div>
</div>
<div class="usa-footer__contact-links mobile-lg:grid-col-2">
<div class="usa-footer__contact-links mobile-lg:grid-col-6">
<h3 class="usa-footer__contact-heading">Contact Us</h3>
<address class="usa-footer__address">
<div class="usa-footer__contact-info grid-row grid-gap">
Expand Down
7 changes: 2 additions & 5 deletions _includes/highlights.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{% 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 %}


<div class="clearfix padding-y-4">
<h2 class="text-primary-darker header-center" style="text-align: center;">Community News</h2>
{% for post in paginator.posts | sort: 'date' | reverse limit: 8 %}
{% for post in site.posts | sort: 'date' | reverse limit: 8 %}
<section class="usa-graphic-list usa-section usa-prose clearfix grid-container padding-y-105">
<div class="clearfix shadow-5 radius-lg bg-white padding-4">
<div class="grid-row grid-gap">
Expand Down
206 changes: 0 additions & 206 deletions _pages/Community-News/index.html

This file was deleted.

Loading