Skip to content

Commit

Permalink
Merge branch 'main' into nl-fix-glossary-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-mon1 authored Mar 18, 2024
2 parents e9c8b0f + 43c8eb2 commit 0666775
Show file tree
Hide file tree
Showing 73 changed files with 868 additions and 163 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

orbs:
hugo: circleci/hugo@0.5.2
node: circleci/node@5.1.0
hugo: circleci/hugo@1.3.1
node: circleci/node@5.2.0

defaults: &defaults
executor:
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
root: .
html-proofer:
executor:
name: hugo/cibuilds
name: hugo/default
steps:
- attach_workspace:
at: .
Expand Down
2 changes: 1 addition & 1 deletion .hugo-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.92.0
0.123.3
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20.11.1
42 changes: 21 additions & 21 deletions content/about/style-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,27 +245,27 @@ The overarching name of the site is Digital.gov. You may see references to "Digi
## Logos

{{< accordion title="Expand for digital.gov logo images" icon="edit" >}}
{{< asset-img path="/img/digitalgov-logo.png" alt="" width="220" >}}
{{< asset-img path="/img/digitalgov-logo.svg" alt="" width="220" >}}
{{< asset-img path="/img/digitalgov-logo-small.png" alt="" width="100" >}}
{{< asset-img path="/img/digitalgov-logo-small.svg" alt="" width="100" >}}
{{< asset-img path="/img/digitalgov-logo-white.png" alt="" width="220" bg="dark" >}}
{{< asset-img path="/img/digitalgov-logo-white.svg" alt="" width="220" bg="dark" >}}
{{< asset-img path="/img/digitalgov-logo-small-white.png" alt="" width="100" bg="dark" >}}
{{< asset-img path="/img/digitalgov-logo-small-white.svg" alt="" width="100" bg="dark" >}}
{{< asset-img path="/img/digit-small-black.png" alt="" width="32" >}}
{{< asset-img path="/img/digit-small-black.svg" alt="" width="32" >}}
{{< asset-img path="/img/digit-small-white.png" alt="" width="32" bg="dark" >}}
{{< asset-img path="/img/digit-small-white.svg" alt="" width="32" bg="dark" >}}
{{< asset-img path="/img/digit-150.png" alt="" width="150" >}}
{{< asset-img path="/img/digit-100.png" alt="" width="100" >}}
{{< asset-img path="/img/digit-50.png" alt="" width="50" >}}
{{< asset-img path="/img/digit-25.png" alt="" width="25" >}}
{{< asset-img path="/img/digit-16.png" alt="" width="16" >}}
{{< asset-img path="/img/digit-light.png" alt="" width="100" bg="dark" >}}
{{< asset-img path="/img/digit-dark.png" alt="" width="100" >}}
{{< asset-img path="/img/digit-hi.png" alt="" width="100" >}}
{{< asset-img path="/img/digit-usa.png" alt="" width="100" >}}
{{< asset-img path="img/digitalgov-logo.png" alt="" width="220" >}}
{{< asset-img path="img/digitalgov-logo.svg" alt="" width="220" >}}
{{< asset-img path="img/digitalgov-logo-small.png" alt="" width="100" >}}
{{< asset-img path="img/digitalgov-logo-small.svg" alt="" width="100" >}}
{{< asset-img path="img/digitalgov-logo-white.png" alt="" width="220" bg="dark" >}}
{{< asset-img path="img/digitalgov-logo-white.svg" alt="" width="220" bg="dark" >}}
{{< asset-img path="img/digitalgov-logo-small-white.png" alt="" width="100" bg="dark" >}}
{{< asset-img path="img/digitalgov-logo-small-white.svg" alt="" width="100" bg="dark" >}}
{{< asset-img path="img/digit-small-black.png" alt="" width="32" >}}
{{< asset-img path="img/digit-small-black.svg" alt="" width="32" >}}
{{< asset-img path="img/digit-small-white.png" alt="" width="32" bg="dark" >}}
{{< asset-img path="img/digit-small-white.svg" alt="" width="32" bg="dark" >}}
{{< asset-img path="img/digit-150.png" alt="" width="150" >}}
{{< asset-img path="img/digit-100.png" alt="" width="100" >}}
{{< asset-img path="img/digit-50.png" alt="" width="50" >}}
{{< asset-img path="img/digit-25.png" alt="" width="25" >}}
{{< asset-img path="img/digit-16.png" alt="" width="16" >}}
{{< asset-img path="img/digit-light.png" alt="" width="100" bg="dark" >}}
{{< asset-img path="img/digit-dark.png" alt="" width="100" >}}
{{< asset-img path="img/digit-hi.png" alt="" width="100" >}}
{{< asset-img path="img/digit-usa.png" alt="" width="100" >}}
{{< /accordion >}}

### Branded names and initialisms or acronyms for related services and programs:
Expand Down
2 changes: 1 addition & 1 deletion content/communities/communicators.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Communicators Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 2,342
members: 2,373
join_cop_button: "Communicators community members"

# Controls how this page appears across the site
Expand Down
2 changes: 1 addition & 1 deletion content/communities/multilingual.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Multilingual Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 700
members: 702
join_cop_button: "Multilingual community members"

kicker: "Join the Multilingual Community"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Plain Language Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 2,135
members: 2,149
join_cop_button: "Plain Language community members"

kicker: "Join the Plain Language Community"
Expand Down
2 changes: 1 addition & 1 deletion content/communities/social-media.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Social Media Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 1,432
members: 1,462
join_cop_button: "Social Media community members"

kicker: "Join the Social Media Community"
Expand Down
2 changes: 1 addition & 1 deletion content/communities/user-experience.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the User Experience Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 2,142
members: 2,163
join_cop_button: "User Experience community members"

# see all authors at https://digital.gov/authors
Expand Down
2 changes: 1 addition & 1 deletion content/communities/web-analytics-and-optimization.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Web Analytics Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 955
members: 981
join_cop_button: "Web Analytic community members"

kicker: "Join the Web Analytics Community"
Expand Down
2 changes: 1 addition & 1 deletion content/communities/web-managers-forum.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ community_list:
subscribe_email: "[email protected]"
subscribe_email_subject: "Join the Web Managers Community"
terms: "Government employees and contractors with an official .gov or .mil email are eligible to join."
members: 2,059
members: 2,084
join_cop_button: "Web Manager community members"

primary_image: "white-on-gsa-blue-digital-gov-card-community"
Expand Down
62 changes: 0 additions & 62 deletions content/events/2024/02/2024-02-27-spring-2024-community-summit.md

This file was deleted.

Loading

0 comments on commit 0666775

Please sign in to comment.