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 content branch #2111

Merged
merged 173 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
3c94a9a
Jekyll 4.2 -> 4.3
jdonis Jan 12, 2024
60eb1bd
Merge pull request #1942 from GSA/kgkempe-OI-4775
jarahameador Jun 12, 2024
e3370f5
Bump ws from 7.5.7 to 7.5.10
dependabot[bot] Jun 18, 2024
bb78a9c
Merge pull request #1946 from GSA/dependabot/npm_and_yarn/ws-7.5.10
kkrug Jun 18, 2024
4ea33d6
Merge pull request #1947 from GSA/kgkempe-OI-4730
jarahameador Jun 18, 2024
e93533f
Merge pull request #1950 from GSA/rename-branches-to-prod
kkrug Jun 28, 2024
85f1e32
Merge pull request #1954 from GSA/kgkempe-OI-4859
jarahameador Jul 10, 2024
2064a9f
Update add-challenge-managers.md
kgkempe Jul 26, 2024
a0a4c6e
Update grant-contractor-access.md
kgkempe Jul 26, 2024
15cc941
Update add-challenge-managers.md
kgkempe Jul 29, 2024
faaa141
Update grant-contractor-access.md
kgkempe Jul 29, 2024
ac8712b
Merge pull request #1962 from GSA/kgkempe-OI-4912
jarahameador Jul 31, 2024
340e949
Merge pull request #1963 from GSA/kgkempe-OI-4912
jarahameador Jul 31, 2024
10f03b4
Create 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
4dbc737
Update 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
9582de9
Add files via upload
kgkempe Aug 9, 2024
c496b26
Update 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
6b84e7e
Update 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
25bf7b1
Update resources.md
kgkempe Aug 9, 2024
19af457
Update 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
d4b9518
Update 2024-08-12-whats-in-a-name.md
kgkempe Aug 9, 2024
eb76241
Update 2024-08-12-whats-in-a-name.md
r-bartlett-gsa Aug 9, 2024
09f8cd8
Update blog-sidenav.html
r-bartlett-gsa Aug 9, 2024
e8569cb
Update 2024-08-12-whats-in-a-name.md
r-bartlett-gsa Aug 9, 2024
3748417
Merge pull request #1986 from GSA/kgkempe-1985
jarahameador Aug 9, 2024
6ad4298
Merge pull request #1987 from GSA/kgkempe-1985
jarahameador Aug 11, 2024
4a48ed6
Update events.md
kgkempe Aug 14, 2024
0b2b54b
Update events.md
kgkempe Aug 14, 2024
fb63e82
Update events.md
kgkempe Aug 14, 2024
e32799d
Update events.md
kgkempe Aug 14, 2024
da3d47d
Update events.md
kgkempe Aug 14, 2024
98c399a
Update community.md
jarahameador Aug 15, 2024
3cb2a61
Merge pull request #1990 from GSA/jarahameador-community-update
kkrug Aug 15, 2024
a0e1fb2
Merge pull request #1991 from GSA/kgkempe-1989
kkrug Aug 16, 2024
183284f
Merge pull request #1992 from GSA/kgkempe-1989
kkrug Aug 16, 2024
999c473
Bump rexml from 3.2.6 to 3.3.6
dependabot[bot] Aug 22, 2024
ebd5138
Bump snyk from 1.996.0 to 1.1064.0
dependabot[bot] Jan 18, 2023
b91d259
upgrade pa11y-ci library to 3.1.0
jdonis Aug 27, 2024
67fc25c
Merge branch 'staging' into jdonis-1959-dependabot-81
jdonis Aug 27, 2024
c6b7072
Merge pull request #2006 from GSA/jdonis-1959-dependabot-81
kkrug Aug 27, 2024
86edef6
Merge branch 'staging' into snyk-update-1.1064
kkrug Aug 27, 2024
70c7f99
Merge pull request #2005 from GSA/snyk-update-1.1064
jdonis Aug 27, 2024
1a57d1f
Merge pull request #2007 from GSA/staging
jdonis Aug 28, 2024
6c8928d
Update epa-nutrient-sensor.md
r-bartlett-gsa Aug 30, 2024
cc0637c
Merge pull request #2014 from GSA/linkfix-08-30-24
jarahameador Sep 2, 2024
dfcf320
Merge pull request #2015 from GSA/linkfix-08-30-24
jarahameador Sep 3, 2024
3cd0e01
Merge pull request #2003 from GSA/dependabot/bundler/rexml-3.3.6
kkrug Sep 3, 2024
b7821f8
Update lodash to 4.17.21
kkrug Sep 3, 2024
315f708
Bump rexml from 3.2.6 to 3.3.6
dependabot[bot] Aug 22, 2024
8f39a08
Update lodash to 4.17.21
kkrug Sep 3, 2024
9a23852
Uddate Gulp to 5.0.0. and related dependencies - from staging branch
jairoanaya Sep 10, 2024
f4768dd
update nvmrc
jairoanaya Sep 13, 2024
d5021e9
reseting the package-lock
jairoanaya Sep 13, 2024
54baac4
remove conflicting and unused dependancy uswds-gulp
jairoanaya Sep 13, 2024
58dcedc
Update events.md
kgkempe Sep 19, 2024
bbbb9d4
Update events.md
kgkempe Sep 19, 2024
af7c036
Update events.md
kgkempe Sep 19, 2024
90a4e53
Create 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 20, 2024
b1a4bee
Update 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 20, 2024
057ff72
Update 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 20, 2024
1f6f1bb
Update 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 20, 2024
013f88f
Update 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 20, 2024
0db2068
Update resources.md
kgkempe Sep 20, 2024
d4a3dc1
Update events.md
kgkempe Sep 22, 2024
3531159
Update 2024-09-20-agency-directives-on-prize-competitions.md
kgkempe Sep 22, 2024
e098462
javascript console errors #2025
kkrug Sep 19, 2024
f39982a
javascript console errors #2025
kkrug Sep 19, 2024
f8472dd
Bump webrick from 1.8.1 to 1.8.2
dependabot[bot] Sep 25, 2024
e07a124
Solve conflicts kgkempe-2026
jdonis Sep 27, 2024
e65e5ca
Merge pull request #2033 from GSA/kgkempe-2026
jdonis Sep 27, 2024
e6b041d
Merge pull request #2031 from GSA/staging
jdonis Sep 27, 2024
82d62fa
Uncontrolled resource consumption in braces #137
jdonis Sep 30, 2024
b88f506
Command Injection in lodash #132, updating gulp-notify
jdonis Sep 30, 2024
057081d
semver vulnerable to Regular Expression Denial of Service #119semver …
jdonis Sep 30, 2024
98e6b0f
Merge pull request #2032 from GSA/dependabot/bundler/webrick-1.8.2
kkrug Sep 30, 2024
54f095c
Merge pull request #2034 from GSA/dependabot-fix-general
kkrug Sep 30, 2024
1c47d69
force semver to 7.5.2
jdonis Oct 3, 2024
7aca32e
Update google-protobuf to solve dependabot
jdonis Oct 3, 2024
5c589cb
Merge pull request #2044 from GSA/dependabot-fix-general-2
kkrug Oct 3, 2024
01a86b5
PostCSS update
jdonis Oct 3, 2024
a62c21b
Merge pull request #2045 from GSA/dependabot-fix-general-2
kkrug Oct 3, 2024
07a2311
Merge pull request #2046 from GSA/staging
kkrug Oct 9, 2024
9915541
Update events.md
kgkempe Oct 10, 2024
738307f
Update events.md
kgkempe Oct 10, 2024
3ec9e6f
Update events.md
kgkempe Oct 10, 2024
dee5381
Create 2024-10-10-Creative-Ideas-for-Non-monetary-Prizes.md
kgkempe Oct 10, 2024
8208b02
Update and rename 2024-10-10-Creative-Ideas-for-Non-monetary-Prizes.m…
kgkempe Oct 10, 2024
13aa981
Add files via upload
kgkempe Oct 10, 2024
b03298d
Update 2024-10-10-creative-ideas-for-non-monetary-prizes.md
kgkempe Oct 10, 2024
d03289d
Update resources.md
kgkempe Oct 10, 2024
4d9596a
Update 2024-10-10-creative-ideas-for-non-monetary-prizes.md
kgkempe Oct 10, 2024
f74ac78
Update 2024-10-10-creative-ideas-for-non-monetary-prizes.md
kgkempe Oct 10, 2024
ca59544
Update blog-sidenav.html
r-bartlett-gsa Oct 11, 2024
6ef9b5a
Merge pull request #2050 from GSA/kgkempe-2047
jarahameador Oct 15, 2024
70a2dfc
Merge pull request #2051 from GSA/staging
jarahameador Oct 16, 2024
6517a2f
Create 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
9be8ba1
Update 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
6d41c59
Update 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
8d117f9
Update 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
14acad1
Update 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
fc88bdb
Update 2024-10-24-Federal-Innovation-Through-Prize-Competitions-US-De…
kgkempe Oct 23, 2024
0ec3eb4
Update and rename 2024-10-24-Federal-Innovation-Through-Prize-Competi…
kgkempe Oct 23, 2024
2971311
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
29c54e9
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
7603056
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
2a29bd6
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
a780605
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
311dc99
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
6b1c90c
Update 2024-10-24-webinar-us-department-of-energy-american-made-progr…
kgkempe Oct 23, 2024
073f880
Delete _posts/2024-10-24-webinar-us-department-of-energy-american-mad…
kgkempe Oct 23, 2024
a00cb62
Create 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
f45a0e1
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
c565187
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
30e8d85
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
9588285
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
c1f3c7c
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
6b3e72c
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
8ec87b0
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
3e81785
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 23, 2024
f62b3c1
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
755ed45
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
122221d
Add files via upload
kgkempe Oct 28, 2024
31e5927
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
d43d819
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
1dd7b62
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
d68d3f9
Update events.md
kgkempe Oct 28, 2024
e4122f4
Update 2024-10-24-department-of-energy-american-made-program.md
r-bartlett-gsa Oct 28, 2024
62b19b0
Update 2024-10-24-department-of-energy-american-made-program.md
kgkempe Oct 28, 2024
99337a3
Update resources.md
kgkempe Oct 28, 2024
6a239be
Bump rexml from 3.3.7 to 3.3.9
dependabot[bot] Oct 28, 2024
04a813a
Update events.md
kgkempe Oct 28, 2024
d041b46
Update events.md
kgkempe Oct 28, 2024
ccb476d
Merge pull request #2058 from GSA/kgkempe-2053
jarahameador Oct 28, 2024
67ddbe7
Merge pull request #2060 from GSA/staging
jarahameador Oct 29, 2024
ad70693
Update events.md
kgkempe Nov 12, 2024
7e4761c
Update events.md
kgkempe Nov 12, 2024
0c4a6d0
Add files via upload
kgkempe Nov 12, 2024
5712612
Create 2024-10-30-ama-with-nih.md
kgkempe Nov 12, 2024
28215e1
Update 2024-10-30-ama-with-nih.md
kgkempe Nov 12, 2024
2e395df
Update 2024-10-30-ama-with-nih.md
kgkempe Nov 12, 2024
0458743
Create 2024-11-12-national-institutes-of-health-webinar
kgkempe Nov 12, 2024
2b30a8d
Delete _posts/2024-11-12-national-institutes-of-health-webinar
kgkempe Nov 12, 2024
15b7fd7
Create 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 12, 2024
a0960e5
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 12, 2024
4d7d554
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 12, 2024
689cdb3
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 12, 2024
f7b5a5e
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 12, 2024
13a35fc
Update resources.md
kgkempe Nov 12, 2024
b892234
Update events.md
kgkempe Nov 12, 2024
3de9fb9
Merge pull request #2076 from GSA/kgkempe-2075
jarahameador Nov 13, 2024
aa2106e
Merge pull request #2057 from GSA/dependabot/bundler/rexml-3.3.9
jairoanaya Nov 14, 2024
5863eaa
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 14, 2024
6ad8ca5
Update 2024-11-12-national-institutes-of-health-webinar.md
kgkempe Nov 14, 2024
c00d117
Merge pull request #2081 from GSA/kgkempe-2075
jarahameador Nov 14, 2024
a8a9040
Fixing SRI for Production and Staging resources, plus removing metada…
jairoanaya Nov 15, 2024
4b34dd5
Merge pull request #2082 from GSA/2064-pages-vulnerability-report-fix…
kkrug Nov 18, 2024
8f05772
Securing additional staging assets
jairoanaya Nov 22, 2024
2c5ab7a
Merge pull request #2083 from GSA/2064-pages-vulnerability-report-fix…
jdonis Nov 25, 2024
5f23278
Fixing Google Tag JS and removing timespan on asset
jairoanaya Nov 26, 2024
c5f251e
Merge pull request #2084 from GSA/2064-pages-vulnerability-report-fix…
kkrug Nov 26, 2024
cf899c6
Fixing unsuppressed report 2536
jairoanaya Nov 27, 2024
46344ac
Merge pull request #2092 from GSA/2065-pages-accessibility-report-fix…
kkrug Nov 29, 2024
c9d9f27
Fixing additional issues on report 2536
jairoanaya Nov 29, 2024
7d3d23c
Merge pull request #2093 from GSA/2065-pages-accessibility-report-fix…
kkrug Nov 29, 2024
e62e5f8
Fix SHA Hash for staging
jairoanaya Dec 17, 2024
829ea01
Merge pull request #2098 from GSA/2064-pages-vulnerability-report-fix…
kkrug Dec 18, 2024
7f2faee
Fix Broken link pointing to an unclaimed S3 bucket
jairoanaya Dec 19, 2024
f6608d0
Merge pull request #2101 from GSA/2099-broken-link-pointing-to-an-unc…
kkrug Dec 20, 2024
6afefe0
Undoing the SRI
jairoanaya Dec 20, 2024
72e2c7f
Adding GTM 53NN
jairoanaya Dec 20, 2024
af40669
Merge pull request #2102 from GSA/2064-pages-vulnerability-report-fix…
kkrug Dec 20, 2024
a7c7bf2
Merge pull request #2103 from GSA/2095-add-gtm-to-challengegov
kkrug Dec 20, 2024
28f4b79
Merge branch 'fy24-q3-content-updates' into staging
kkrug Dec 26, 2024
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 .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.0
v18.19.0
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source "https://rubygems.org"
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
# gem "jekyll", "~> 3.8.4"
gem "jekyll", "~> 4.2.0"
gem "jekyll", "~> 4.3.0"


# If you have any plugins, put them here!
Expand Down
81 changes: 49 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
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.2)
concurrent-ruby (1.3.4)
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)
forwardable-extended (2.6.0)
google-protobuf (4.28.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.28.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.28.2-x86_64-linux)
bigdecimal
rake (>= 13)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
Expand All @@ -22,32 +32,32 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.8.0)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
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)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-last-modified-at (1.3.0)
jekyll-last-modified-at (1.3.2)
jekyll (>= 3.7, < 5.0)
posix-spawn (~> 0.3.9)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
Expand All @@ -57,45 +67,52 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.8.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
nokogiri (1.15.5-x86_64-linux)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
pagemaster (2.1.2)
jekyll (~> 4)
rainbow (~> 3.0)
safe_yaml (~> 1.0)
parallel (1.23.0)
parallel (1.26.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
posix-spawn (0.3.15)
public_suffix (5.0.4)
racc (1.7.3)
public_suffix (6.0.1)
racc (1.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.9)
rouge (4.3.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
sass-embedded (1.78.0)
google-protobuf (~> 4.27)
rake (>= 13)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (1.8.0)
webrick (1.8.1)
unicode-display_width (2.5.0)
webrick (1.8.2)
yell (2.2.2)

PLATFORMS
arm64-darwin-23
x86_64-darwin-23
x86_64-linux

DEPENDENCIES
html-proofer (~> 3.10)
jekyll (~> 4.2.0)
jekyll (~> 4.3.0)
jekyll-feed (~> 0.6)
jekyll-last-modified-at
jekyll-redirect-from
Expand All @@ -105,4 +122,4 @@ DEPENDENCIES
webrick (~> 1.8)

BUNDLED WITH
2.3.22
2.5.18
2 changes: 1 addition & 1 deletion _includes/blog-sidenav.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="border-top-1 border-accent-cool-darker padding-top-2 margin-bottom-4 usa-prose">
<h3 class="margin-bottom-0" style="color:#112f4e;">Recent Posts</h3>
<ul class="usa-list usa-list--unstyled padding-top-2">
{% for post in site.posts limit:6 %}
{% for post in site.posts limit:20 %}
<li class="padding-bottom-1 margin-bottom-0">
<a class="usa-link" href="{{site.baseurl}}{{post.url}}">
{{ post.title }}
Expand Down
4 changes: 2 additions & 2 deletions _includes/cm-user-guide-nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
.child-link {
text-indent: 2em;
color: #757575;
color: #6E6E6E;
font-weight: 500;
}
.usa-sidenav__item a:not(.usa-current):hover {
Expand All @@ -24,7 +24,7 @@

.usa-sidenav__sublist a:not(.usa-current),
.usa-sidenav__item a.child-link:not(.usa-current) {
color: #757575 !important;
color: #6E6E6E !important;
}

.usa-current {
Expand Down
38 changes: 22 additions & 16 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,31 +84,37 @@
<script id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap_agency}}"></script>
{% if site.branch == "production" %}
<link rel="stylesheet" href="https://portal.challenge.gov/css/public.css" crossorigin="anonymous">
<script src="https://portal.challenge.gov/js/public.js"></script>
<script src="https://portal.challenge.gov/js/client.js"></script>
<script src="https://portal.challenge.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://portal.challenge.gov/js/client.js" crossorigin="anonymous"></script>
{% elsif site.branch == "staging" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>{% elsif site.branch == "dev" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js"></script>
{% elsif site.branch == "dev" %}
<link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js"></script>
{% elsif jekyll.environment == "dev" %}
<script src="https://challenge-portal-staging.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-staging.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>{% elsif jekyll.environment == "dev" %}
<link rel="stylesheet" href="http://localhost:4000/css/public.css" crossorigin="anonymous">
<script src="http://localhost:4000/js/public.js"></script>
<script src="http://localhost:4000/js/client.js"></script>
{% else %}
<link rel="stylesheet" href="https://challenge-portal-dev.app.cloud.gov/css/public.css" crossorigin="anonymous">
<script src="https://challenge-portal-dev.app.cloud.gov/js/public.js"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/client.js"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/public.js" crossorigin="anonymous"></script>
<script src="https://challenge-portal-dev.app.cloud.gov/js/client.js" crossorigin="anonymous"></script>
{% endif %}
<script>
// Explore challenges button scroll to active challenges section of react app
document.getElementById("js-explore-challenges").addEventListener("click", function(e) {
var scrollTarget = document.getElementById(e.target.getAttribute("data-anchor"))
scrollTarget.scrollIntoView()
})
document.addEventListener("DOMContentLoaded", function() {
var exploreChallengesElement = document.getElementById("js-explore-challenges");

if (exploreChallengesElement) {
exploreChallengesElement.addEventListener("click", function(e) {
var scrollTarget = document.getElementById(e.target.getAttribute("data-anchor"));
if (scrollTarget) {
scrollTarget.scrollIntoView();
}
});
}
});

// Footer archived challenges link to scroll to top of page
document.getElementById("js-archived-challenges").addEventListener("click", function(e) {
Expand All @@ -132,7 +138,7 @@
ga('send', 'pageview');
</script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HE61P192WE"></script>
<script src="https://www.googletagmanager.com/gtag/js?id=G-HE61P192WE" crossorigin="anonymous"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
Expand Down
Loading
Loading