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

Update PRA to USWDS 3.0 #325

Merged
merged 44 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
d4122fc
installed uswds 3, at step 3
nick-mon1 Jul 27, 2022
df200b9
updated sass version
nick-mon1 Jul 27, 2022
87af04c
on step 3, point 5
nick-mon1 Jul 28, 2022
9a2bb95
npm install and still stuck at step 3, gulp step 5
nick-mon1 Jul 28, 2022
1dc930b
still getting ReferenceError
nick-mon1 Jul 28, 2022
3652279
updated to use uswds 3 styles
nick-mon1 Aug 3, 2022
791d96c
updated sass structure
nick-mon1 Aug 3, 2022
e0bcda5
updated .gitignore
nick-mon1 Aug 3, 2022
5cf7d4f
updated gulpfile to use uswds-compile
nick-mon1 Aug 3, 2022
b18cd7b
removed npm packages and cleaned up package.json for uswds-compile
nick-mon1 Aug 3, 2022
2d3ee0f
removed img,fonts for new commit
nick-mon1 Aug 3, 2022
6b6af71
updated .circleci settings
nick-mon1 Aug 3, 2022
a182dc6
updated fonts
nick-mon1 Aug 3, 2022
1fe9e6e
updated images
nick-mon1 Aug 3, 2022
aca14c2
updated image path
nick-mon1 Aug 3, 2022
f819959
updated build process
nick-mon1 Aug 3, 2022
6a9f80e
fixed package.json
nick-mon1 Aug 3, 2022
0ee7ff5
updated circleci script
nick-mon1 Aug 3, 2022
22fadf3
updated build process for uswds-compile
nick-mon1 Aug 4, 2022
e278dea
updated to use uswds packages
nick-mon1 Aug 4, 2022
d2b255b
removed uswds 3 assets
nick-mon1 Aug 4, 2022
0536ac6
updated gulpfile
nick-mon1 Aug 4, 2022
5b4d964
updated README.md for uswds-compile
nick-mon1 Aug 4, 2022
44c7728
fixed package.json for build
nick-mon1 Aug 4, 2022
d04d97b
updated package.json for build
nick-mon1 Aug 5, 2022
905d085
update circleci image
nick-mon1 Aug 5, 2022
11955c9
updated image paths to use base.url
nick-mon1 Aug 5, 2022
bf735c4
fixed sass compilation
nick-mon1 Aug 11, 2022
a9489cb
fixed load path with styles.css
nick-mon1 Aug 15, 2022
6152565
replaced jekyll-pages search with search.gov
nick-mon1 Aug 15, 2022
4a2cc5b
removed jekyll_pages_api_search
nick-mon1 Aug 15, 2022
c6902f3
cleaned up old search files
nick-mon1 Aug 15, 2022
0229e62
Merge branch 'master' into nl-update-uswds
nick-mon1 Aug 16, 2022
e7d3306
added federalist build script
nick-mon1 Aug 19, 2022
f507b15
Merge branch 'nl-update-uswds' of https://github.com/GSA/digitalgov-p…
nick-mon1 Aug 19, 2022
5a12d06
added federalist build script post merge
nick-mon1 Aug 19, 2022
82d8bea
added scripts for glossary and contacts
nick-mon1 Aug 22, 2022
618e9e4
Merge branch 'master' into nl-update-uswds
nick-mon1 Aug 24, 2022
728d236
updated npm packages
nick-mon1 Aug 24, 2022
9a0dcec
Merge branch 'nl-update-uswds' of https://github.com/GSA/digitalgov-p…
nick-mon1 Aug 24, 2022
081567b
updated package.json after merge
nick-mon1 Aug 24, 2022
187fb48
refactored changes requested by @mejiaj
nick-mon1 Sep 2, 2022
ba441dd
removed assets/uswds/img files
nick-mon1 Sep 6, 2022
8b8318b
removed more assets/uswds/img files
nick-mon1 Sep 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/ruby:2.6.2-node-browsers
- image: cimg/ruby:3.0.4-browsers
working_directory: ~/repo
steps:
- checkout
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ _site
.sass-cache
.jekyll-metadata
.DS_store

assets/uswds/img/
assets/uswds/fonts/
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ gem "jekyll", "~> 3.9.2"
gem "jekyll-redirect-from"

group :jekyll_plugins do
gem 'jekyll_pages_api_search'
gem 'jekyll-sitemap'
gem 'jekyll-email-protect'
end
Expand Down
8 changes: 0 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ GEM
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
htmlentities (4.3.4)
http_parser.rb (0.8.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
Expand All @@ -47,12 +46,6 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jekyll_pages_api (0.1.6)
htmlentities (~> 4.3)
jekyll (>= 2.0, < 4.0)
jekyll_pages_api_search (0.5.0)
jekyll_pages_api (~> 0.1.4)
sass (~> 3.4)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -99,7 +92,6 @@ DEPENDENCIES
jekyll-email-protect
jekyll-redirect-from
jekyll-sitemap
jekyll_pages_api_search
kramdown-parser-gfm
rexml (~> 3.2)
webrick (~> 1.7)
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ To run the site locally, from the project folder, run:
npm start
```

If you are missing fonts or images, install assets for local development with:

```
npm run build
```


If all goes well, visit the site at `http://localhost:4000`.

## Accessibility tests
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ plugins:
- jekyll-redirect-from
- jekyll-sitemap


# Build settings
scripts:
- assets/uswds/js/uswds.min.js
- assets/js/bundle.js
nick-mon1 marked this conversation as resolved.
Show resolved Hide resolved

styles:
- assets/uswds/css/styles.css
Expand Down
2 changes: 1 addition & 1 deletion _includes/glossary.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="display-flex flex-column flex-align-end">
<button title="Close glossary" class="js-glossary-close display-flex flex-align-center">
<span class="margin-right-1">Close</span>
<img src="{{ '/assets/uswds/img/close-white.svg' | relative_url }}" alt="Hide glossary" />
<img src="{{ site.baseurl }}/assets/uswds/img/usa-icons-bg/close--white.svg" alt="Hide glossary" />
</button>
</div>

Expand Down
19 changes: 12 additions & 7 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<button class="usa-menu-btn text-semibold">Menu</button>
</div>
<nav role="navigation" class="usa-nav">
<div class="usa-nav__inner"><button class="usa-nav__close"><img src="{{ '/assets/uswds/img/close.svg' | relative_url }}" alt="close" /></button>
<div class="usa-nav__inner"><button class="usa-nav__close"><img src="{{ site.baseurl }}/assets/uswds/img/usa-icons/close.svg" alt="close" /></button>

{% assign primary_links = site.data.navigation %} {% if primary_links %}
<ul class="usa-nav__primary usa-accordion">
Expand All @@ -34,12 +34,17 @@
<a href="{{ '/contact' | relative_url}}">Get PRA Help</a>
</li>
</ul>
<form action="{{ '/search/' | relative_url}}" class="usa-search usa-search--small ">
<div role="search">
<label class="usa-sr-only" for="search-input">Search</label>
<input class="usa-input" id="search-input" type="search" name="q">
<button class="usa-button" type="submit"><span class="usa-sr-only">Search</span></button>
</div>
<form class="usa-search usa-search--small site-search" role="search" action="https://search.usa.gov/search" accept-charset="UTF-8" method="get">
<input type="hidden" name="affiliate" id="affiliate" value="digitalgov-pra" autocomplete="off" />
<label for="query" class="usa-sr-only"></label>
<input type="text" name="query" id="query" autocomplete="off" class="usagov-search-autocomplete" />
<button class="usa-button" type="submit">
<img
src="{{ '/assets/uswds/img/usa-icons-bg/search--white.svg' | relative_url }}"
class="usa-search__submit-icon"
alt="Search"
/>
</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/identifier.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<div class="usa-identifier__usagov-description">
Looking for U.S. government information and services?
</div>
<a href="https://www.usa.gov/" class="usa-link">Visit USA.gov</a>
<a href="https://www.usa.gov/" class="usa-link usa-link--external">Visit USA.gov</a>
</div>
</section>
</div>
6 changes: 3 additions & 3 deletions _includes/scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<script src="{{ _src | replace: _async_marker, '' | relative_url }}" {% if _script.async or _src contains _async_marker %} async{% endif %}></script>
{% endfor %}{% endfor %}

{% if page.layout == 'search-results' %}
{% jekyll_pages_api_search_load %}
{% endif %}

<script async type="text/javascript" src="{{ "assets/uswds/js/bundle.js" | relative_url }}"></script>
nick-mon1 marked this conversation as resolved.
Show resolved Hide resolved

<!-- We participate in the US government's analytics program. See the data at analytics.usa.gov. -->
<script async type="text/javascript" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA&subagency=TTS" id="_fed_an_ua_tag"></script>
<script src="//search.usa.gov/javascripts/remote.loader.js"></script>
2 changes: 1 addition & 1 deletion _includes/styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
page.styles | uniq %} {% for _list in _styles %}{% for _style in _list %}
<link rel="stylesheet" href="{{ _style.href | default: _style | relative_url }}" media="{{ _style.media | default: 'screen' }}" />
{% endfor %}{% endfor %}
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous" />
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous" />
nick-mon1 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<head>
{% include google-analytics.html %}
<script async type="text/javascript" src="{{ "assets/uswds/js/uswds-init.min.js" | relative_url }}"></script>
{% include meta.html %} {% include styles.html %}
</head>

Expand Down
6 changes: 0 additions & 6 deletions _layouts/search-results.html

This file was deleted.

9 changes: 9 additions & 0 deletions _scss/_theme-variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
$theme-h1-mobile-font-size: "xl";
$theme-h2-mobile-font-size: "lg";
$theme-h3-mobile-font-size: "md";
$theme-h4-mobile-font-size: "sm";
$theme-h5-mobile-font-size: "xs";
$theme-navigation-width: "desktop";
$theme-identifier-background-color: "indigo-warm-80";
$theme-identifier-primary-link-color: "gray-cool-30";
$theme-identifier-secondary-link-color: "gray-cool-10";
133 changes: 0 additions & 133 deletions _scss/_uswds-theme-color.scss

This file was deleted.

66 changes: 0 additions & 66 deletions _scss/_uswds-theme-components.scss

This file was deleted.

Loading