Skip to content

Commit

Permalink
Merge pull request #292 from uswds/develop
Browse files Browse the repository at this point in the history
Public Sans 2.001 (Maintenance update 1)
  • Loading branch information
thisisdano authored Dec 30, 2024
2 parents c792316 + d2a8790 commit aeb0317
Show file tree
Hide file tree
Showing 17 changed files with 2,771 additions and 10,055 deletions.
2 changes: 1 addition & 1 deletion .bundler-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1
2.4.22
67 changes: 67 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
* @uswds/admins

# This is a comment.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
# * @global-owner1 @global-owner2

# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
# modifies JS files, only @js-owner and not the global
# owner(s) will be requested for a review.
# *.js @js-owner #This is an inline comment.

# You can also use email addresses if you prefer. They'll be
# used to look up users just like we do for commit author
# emails.
# *.go [email protected]

# Teams can be specified as code owners as well. Teams should
# be identified in the format @org/team-name. Teams must have
# explicit write access to the repository. In this example,
# the octocats team in the octo-org organization owns all .txt files.
# *.txt @octo-org/octocats

# In this example, @doctocat owns any files in the build/logs
# directory at the root of the repository and any of its
# subdirectories.
# /build/logs/ @doctocat

# The `docs/*` pattern will match files like
# `docs/getting-started.md` but not further nested files like
# `docs/build-app/troubleshooting.md`.
# docs/* [email protected]

# In this example, @octocat owns any file in an apps directory
# anywhere in your repository.
# apps/ @octocat

# In this example, @doctocat owns any file in the `/docs`
# directory in the root of your repository and any of its
# subdirectories.
# /docs/ @doctocat

# In this example, any change inside the `/scripts` directory
# will require approval from @doctocat or @octocat.
# /scripts/ @doctocat @octocat

# In this example, @octocat owns any file in a `/logs` directory such as
# `/build/logs`, `/scripts/logs`, and `/deeply/nested/logs`. Any changes
# in a `/logs` directory will require approval from @octocat.
# **/logs @octocat

# In this example, @octocat owns any file in the `/apps`
# directory in the root of your repository except for the `/apps/github`
# subdirectory, as its owners are left empty.
# /apps/ @octocat
# /apps/github

# In this example, @octocat owns any file in the `/apps`
# directory in the root of your repository except for the `/apps/github`
# subdirectory, as this subdirectory has its own owner @doctocat
# /apps/ @octocat
# /apps/github @doctocat
79 changes: 79 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Bug Report 🐞
description: Report a bug and help Public Sans improve.
title: "Public Sans - Bug: [YOUR TITLE]"
labels: ['Type: Bug','Needs: Confirmation']
body:
- type: textarea
id: problem
attributes:
label: Describe the bug
description: Add a clear and concise description of the bug. Let us know if it impacts major or minor functionality and if you have workaround.
validations:
required: true
- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the bug
description: Describe how to reproduce this issue.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error...
validations:
required: true
- type: textarea
id: expectation
attributes:
label: Expected Behavior
description: Add a clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
id: code
attributes:
label: Related code
description: If available, include relevant code snippets or a link to a demo of the bug.
validations:
required: false
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Add screenshots to help provide context, if applicable.
validations:
required: false
- type: textarea
id: system
attributes:
label: System setup
description: Provide your system details. Be sure to include your USWDS version, device, operating system, and browser (with version).
placeholder: |
- Public Sans version:
- Device:
- Operating system:
- Browser and version:
validations:
required: false
- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context about the problem.
validations:
required: false
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: Please confirm the following
options:
- label:
I agree to follow this project's [Code of
Conduct](https://designsystem.digital.gov/about/community/#community-conduct).
required: true
- label:
I checked the [current
issues](https://github.com/uswds/public-sans/issues) for
duplicate bug reports.
required: true
51 changes: 51 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Feature Request 💡
description: Suggest a new idea for Public Sans.
title: 'Public Sans - Feature: [YOUR TITLE]'
labels: ['Type: Feature Request']
body:
- type: markdown
attributes:
value: '## Feature Request 💡'
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: "Provide a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]"
validations:
required: true
- type: textarea
id: solution
attributes:
label: "Describe the solution you'd like"
description: "Provide a clear and concise description of what you want to happen."
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: "Describe alternatives you've considered"
description: "Provide a clear and concise description of any alternative solutions or features you've considered."
validations:
required: false
- type: textarea
id: context
attributes:
label: Additional context
description: "Add any other context or screenshots about the feature request."
validations:
required: false
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: Please confirm the following
options:
- label:
I agree to follow this project's [Code of
Conduct](https://designsystem.digital.gov/about/community/#community-conduct).
required: true
- label:
I checked the [current
issues](https://github.com/uswds/public-sans/issues) for
duplicate feature requests.
required: true
20 changes: 20 additions & 0 deletions .github/workflows/add-issue-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Label issues
on:
issues:
types:
- opened
jobs:
label_issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/github-script@v6
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["Status: Triage"]
})
16 changes: 16 additions & 0 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Add all issues to project board

on:
issues:
types:
- opened

jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/uswds/projects/8
github-token: ${{ secrets.ADD_TO_PROJECT }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ report.json
instance_ufo
master_ufo
false/_logs
*.zip
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
lts/*
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.2.5
6 changes: 6 additions & 0 deletions FONTLOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ To contribute to Public Sans please read [CONTRIBUTING.md](https://github.com/us

See [the Public Sans releases page](https://github.com/uswds/public-sans/releases) for more details about changes to the typeface.

December 30 2024 Public Sans v2.001 (Maintenance update 1)
- https://github.com/uswds/public-sans/releases/tag/v2.001-maintenance-1
General
- Updates to repo settings and project dependencies
- No updates to font files or version

April 29 2022 Public Sans v2.001
- https://github.com/uswds/public-sans/releases/tag/v2.001
General
Expand Down
69 changes: 38 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,68 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.3.4)
daemons (1.4.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.17.0)
forwardable-extended (2.6.0)
google-protobuf (4.29.1)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.10.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
jekyll (4.3.4)
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)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
rack (2.2.3)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
public_suffix (6.0.1)
rack (2.2.10)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.28.0)
rexml (3.4.0)
rouge (4.5.1)
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)
thin (1.8.1)
sass-embedded (1.83.0)
google-protobuf (~> 4.28)
rake (>= 13)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
unicode-display_width (1.8.0)
webrick (1.7.0)
unicode-display_width (2.6.0)
webrick (1.9.1)

PLATFORMS
ruby
Expand All @@ -73,4 +80,4 @@ DEPENDENCIES
webrick (~> 1.7)

BUNDLED WITH
2.3.12
2.4.21
Loading

0 comments on commit aeb0317

Please sign in to comment.