Skip to content

Commit

Permalink
first pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@SHarfenist-REISys
SHarfenist-REISys committed Jul 16, 2024
1 parent 8d39102 commit 3a9f00d
Show file tree
Hide file tree
Showing 21 changed files with 2,873 additions and 2,256 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ assets/uswds/
assets/js/uswds.js
assets/js/uswds.min.js
assets/js/uswds.min.js.map
assets/js/uswds-init.js
assets/js/uswds-init.min.js
assets/js/uswds-init.min.js.map
_pages/payment-accuracy/assets/fonts/
!_pages/payment-accuracy/assets/fonts/.gitkeep
_pages/payment-accuracy/assets/img/
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ ruby '>= 3.1.3'

source "https://rubygems.org"

gem "jekyll", "~> 3.8"
gem 'jekyll', '~> 4.3.3'
gem 'jekyll-sass-converter', '~> 3.0'

gem "webrick" # not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524

Expand Down
76 changes: 50 additions & 26 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
ffi (1.16.3)
ffi (1.17.0-x64-mingw-ucrt)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
google-protobuf (4.27.2-x64-mingw-ucrt)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-x86_64-linux)
bigdecimal
rake (>= 13)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
Expand All @@ -22,30 +30,32 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.8.0)
i18n (1.14.3)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
racc (~> 1.7)
jekyll (3.9.5)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (>= 0.7, < 2)
jekyll-sass-converter (~> 1.0)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.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-sass-converter (1.5.2)
sass (~> 3.4)
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)
Expand All @@ -60,49 +70,63 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mercenary (0.4.0)
nokogiri (1.16.2-x64-mingw-ucrt)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.4)
racc (1.7.3)
public_suffix (6.0.0)
racc (1.8.0)
rack (2.2.8.1)
rainbow (3.1.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (3.30.0)
rexml (3.3.1)
strscan
rouge (4.3.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)
sass-embedded (1.77.8)
google-protobuf (~> 4.26)
rake (>= 13)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0)
unicode-display_width (2.5.0)
wdm (0.1.1)
webrick (1.8.1)
yell (2.2.2)

PLATFORMS
x64-mingw-ucrt
x86_64-linux

DEPENDENCIES
html-proofer (~> 3.15)
jekyll (~> 3.8)
jekyll (~> 4.3.3)
jekyll-feed (~> 0.6)
jekyll-paginate-v2 (= 3.0.0)
jekyll-redirect-from
jekyll-sass-converter (~> 3.0)
jekyll-seo-tag
jekyll-sitemap
kramdown-parser-gfm (= 1.1.0)
sprockets (~> 3.7)
tzinfo-data
wdm (~> 0.1.0)
webrick

RUBY VERSION
Expand Down
6 changes: 3 additions & 3 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ 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
#extension: html
# Optional, the default name of the index file for generated pages (e.g. 'index.html')
# Without file extension
indexpage: "index.html"
#indexpage: "index.html"

exclude:
- package.json
Expand All @@ -299,7 +299,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/career-planning-tool/wfm-results.html
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@

<div id="career-advancement-results-container" class="tablet:grid-col-7 desktop:grid-col-8 usa-prose padding-right-4 padding-top-8">
<section class="display-flex flex-row margin-bottom-1" id="series-gs-container">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" aria-multiselectable="true" id="series">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" data-allow-multiple="true" id="series">
<h2 class="usa-accordion__heading"><button class="usa-accordion__button bg-filter text-color" aria-expanded="false" aria-controls="career-search-results-filter-remove-buttons-series" id="btnSeries">Job Series</button></h2>
<div id="career-search-results-filter-remove-buttons-series" class="usa-accordion__content"></div>
</div>
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" aria-multiselectable="true" id="gs">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" data-allow-multiple="true" id="gs">
<h2 class="usa-accordion__heading"><button class="usa-accordion__button bg-filter text-color" aria-expanded="false" aria-controls="career-search-results-filter-remove-buttons-gs" id="btnGS">GS Level</button></h2>
<div id="career-search-results-filter-remove-buttons-gs" class="usa-accordion__content"></div>
</div>
</section>
<section class="display-flex flex-row margin-bottom-1" id="competencies-container">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" aria-multiselectable="true" id="job-competency">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" data-allow-multiple="true" id="job-competency">
<h2 class="usa-accordion__heading"><button class="usa-accordion__button bg-filter text-color" aria-expanded="false" aria-controls="career-search-results-filter-remove-buttons-job-competency" id="btnJobCompetency">Job Specific Technical Competencies</button></h2>
<div id="career-search-results-filter-remove-buttons-job-competency" class="usa-accordion__content"></div>
</div>
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" aria-multiselectable="true" id="general-competency">
<div class="tablet:grid-col-3 usa-accordion usa-accordion--bordered display-none padding-right-1 margin-top" data-allow-multiple="true" id="general-competency">
<h2 class="usa-accordion__heading"><button class="usa-accordion__button bg-filter text-color" aria-expanded="false" aria-controls="career-search-results-filter-remove-buttons-general-competency" id="btnGeneralCompetency">General Career Competencies</button></h2>
<div id="career-search-results-filter-remove-buttons-general-competency" class="usa-accordion__content"></div>
</div>
Expand Down
108 changes: 76 additions & 32 deletions _includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,98 @@
{% else %}
<a class="usa-skipnav" href="#main-content">Skip to main content</a>
{% endif %}
<div class="usa-banner">
<div class="usa-banner" aria-label="Official website of the United States government">
<div class="usa-accordion">
<header class="usa-banner__header">
{% if page.url =='/career-planning-tool/' %}
<div class="usa-banner__inner ogp-banner">
{% else %}
<div class="usa-banner__inner">
{% endif %}
<div class="grid-col-auto">
<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>
<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>
<div class="grid-col-auto">
<img
aria-hidden="true"
class="usa-banner__header-flag"
src="{{ site.baseurl }}/assets/img/us_flag_small.png"
alt="U.S. flag"
/>
</div>
<div class="grid-col-fill tablet:grid-col-auto" aria-hidden="true">
<p class="usa-banner__header-text">
An official website of the United States government
</p>
<p class="usa-banner__header-action">Here’s how you know</p>
</div>
<button
type="button"
class="usa-accordion__button usa-banner__button"
aria-expanded="false"
aria-controls="gov-banner-default"
>
<span class="usa-banner__button-text">Here’s how you know</span>
</button>
</div>
</header>
{% if page.url =='/career-planning-tool/' %}
<div class="usa-banner__content usa-accordion__content ogp-banner" id="gov-banner">
<div class="usa-banner__content usa-accordion__content ogp-banner" id="gov-banner-default" hidden="">
{% else %}
<div class="usa-banner__content usa-accordion__content" id="gov-banner">
<div class="usa-banner__content usa-accordion__content" id="gov-banner-default" hidden="">
{% endif %}
<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" 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>
<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>
<img
class="usa-banner__icon usa-media-block__img"
src="{{ site.baseurl }}/assets/img/icon-dot-gov.svg"
role="img"
alt="Dot gov"
aria-hidden="true"
/>
<div class="usa-media-block__body">
<p>
<strong>Official websites use .gov</strong><br />A
<strong>.gov</strong> website belongs to an official government
organization in the United States.
</p>
</div>
</div>
<div class="usa-banner__guidance tablet:grid-col-6">
<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>
<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>
<img
class="usa-banner__icon usa-media-block__img"
src="{{ site.baseurl }}/assets/img/icon-https.svg"
role="img"
alt="Https"
aria-hidden="true"
/>
<div class="usa-media-block__body">
<p>
<strong>Secure .gov websites use HTTPS</strong><br />A
<strong>lock</strong> (
<span class="icon-lock"
><svg
xmlns="http://www.w3.org/2000/svg"
width="52"
height="64"
viewBox="0 0 52 64"
class="usa-banner__lock-image"
role="img"
aria-labelledby="banner-lock-description-default"
focusable="false"
>
<title id="banner-lock-title-default">Lock</title>
<desc id="banner-lock-description-default">Locked padlock icon</desc>
<path
fill="#000000"
fill-rule="evenodd"
d="M26 0c10.493 0 19 8.507 19 19v9h3a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V32a4 4 0 0 1 4-4h3v-9C7 8.507 15.507 0 26 0zm0 8c-5.979 0-10.843 4.77-10.996 10.712L15 19v9h22v-9c0-6.075-4.925-11-11-11z"
/>
</svg> </span
>) or <strong>https://</strong> means you’ve safely connected to
the .gov website. Share sensitive information only on official,
secure websites.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions _includes/meta.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Title and meta description
================================================== -->
<script src="{{ site.baseurl }}/assets/js/uswds-init.min.js?{{ site.time | date: '%s%N' }}"></script>
{% if page.url contains "cxo-fellows" or page.url contains "payment-accuracy" or page.url contains "frpc" or page.url contains "jfmip" %}
<title>{{page.title}}</title>
<meta property="og:title" content="{{page.title}}">
Expand Down
6 changes: 3 additions & 3 deletions _includes/searchgov/form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<div role="search">
<label class="usa-sr-only" for="extended-search-field-small">Search small</label>
<input class="usa-input usagov-search-autocomplete search" id="extended-search-field-small" type="search" name="query" autocomplete="off">
<button class="usa-button search-button bg-green" type="submit">
<img src="{{site.baseurl}}/assets/images/search.svg" alt="Search Icon" />
</button>
<button class="usa-button search-btn bg-green" type="submit">
<img src="{{site.baseurl}}/assets/img/usa-icons-bg/search--white.svg" class="usa-search__submit-icon" alt="Search" />
</button>
</div>
</form>
{% endif %}
2 changes: 1 addition & 1 deletion _pages/coffa/assets/js/uswds.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3a9f00d

Please sign in to comment.