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.

Sign up for GitHub

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

Jump to bottom

Spelling #760

Merged
merged 9 commits into from
Mar 1, 2022
Merged

Spelling #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b71b77
spelling: drag
jsoref Feb 27, 2022
d4d07d2
spelling: equivalent
jsoref Feb 27, 2022
0f3eb3a
spelling: interpolation
jsoref Feb 27, 2022
892e5b2
spelling: javascript
jsoref Feb 27, 2022
84996fe
spelling: occurred
jsoref Feb 27, 2022
86ac1d6
spelling: output
jsoref Feb 27, 2022
1683b94
spelling: satisfied
jsoref Feb 27, 2022
6656bc2
spelling: transparent
jsoref Feb 27, 2022
4ab7155
Merge branch 'main' into spelling
colebemis Mar 1, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@

### All packages

- We've given Octicons a new look ✨ Some icons have new names and some icons haven't been redesigned yet. The following table documents those changes. If you're using an octicon in v9.x that doesn't have an equivelent in v10.0 yet, let us know by [opening an issue](https://github.com/primer/octicons/issues/new?assignees=&labels=icon+request&template=icon-request.md&title=%5BIcon+request%5D).
- We've given Octicons a new look ✨ Some icons have new names and some icons haven't been redesigned yet. The following table documents those changes. If you're using an octicon in v9.x that doesn't have an equivalent in v10.0 yet, let us know by [opening an issue](https://github.com/primer/octicons/issues/new?assignees=&labels=icon+request&template=icon-request.md&title=%5BIcon+request%5D).
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've excluded this file from checks because the other two items in it were reports of corrections to misspellings.

This item doesn't appear to be intentional.


| v9.x | v10.0 | Notes |
| ------------------------ | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ When creating the changeset always commit into the working branch (pull request

When a pull request is approved merge it into the `main` branch. The changeset action will then create a Release pull request that includes this new pull request.

Once maintainers have agreed and are satisifed with the release. Merge the Release pull request. Changesets will then publish a new GitHub release to the repository with the changelog and new version number. A second action will be triggered by this release and publish the new versions to npm and rubygems.
Once maintainers have agreed and are satisfied with the release. Merge the Release pull request. Changesets will then publish a new GitHub release to the repository with the changelog and new version number. A second action will be triggered by this release and publish the new versions to npm and rubygems.

🎉 Congratulations! The new release has been published.

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The octicons node.js library is the main JavaScript library. With [a JavaScript

| Package | Version |
| ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------- |
| **[@primer/octicons](/lib/octicons_node)** <br />Node.js package with Javascript API | [![npm version](https://img.shields.io/npm/v/@primer/octicons.svg)](https://www.npmjs.org/package/@primer/octicons) |
| **[@primer/octicons](/lib/octicons_node)** <br />Node.js package with JavaScript API | [![npm version](https://img.shields.io/npm/v/@primer/octicons.svg)](https://www.npmjs.org/package/@primer/octicons) |
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This (brand item) is flagged by a distinct check that is still fairly experimental.

| **[@primer/octicons-react](/lib/octicons_react)** <br />React Octicons components | [![npm version](https://img.shields.io/npm/v/@primer/octicons-react.svg)](https://www.npmjs.org/package/@primer/octicons-react) |
| **[@primer/styled-octicons](/lib/octicons_styled)** <br />React Octicons components with Styled System props | [![npm version](https://img.shields.io/npm/v/@primer/styled-octicons.svg)](https://www.npmjs.org/package/@primer/styled-octicons) |

Expand Down
6 changes: 3 additions & 3 deletions docs/src/components/icon-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ export default function IconViewer({children}) {
function gridGradient(angle, size, color) {
// WebKit browsers do not support the "transparent" keyword in gradients.
// As a workaround, we convert `color` to rgba with an alpha value of 0.
const tranparent = rgba(color, 0)
return `linear-gradient(${angle}deg, ${tranparent}, ${tranparent} ${Math.floor(
const transparent = rgba(color, 0)
return `linear-gradient(${angle}deg, ${transparent}, ${transparent} ${Math.floor(
size / 2
)}px, ${color}, ${tranparent} ${Math.floor(size / 2) + 1}px)`
)}px, ${color}, ${transparent} ${Math.floor(size / 2) + 1}px)`
Comment on lines -68 to +71
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the comment appears to be suggesting that WebKit browsers wouldn't like seeing transparent in CSS, I don't think it's saying that they'd object to it in JavaScript.

}

function getGridSize(zoom) {
Expand Down
2 changes: 1 addition & 1 deletion keywords.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"git-pull-request": ["review"],
"github-action": ["board", "workflow", "action", "automation"],
"globe": ["world", "earth", "planet"],
"grabber": ["mover", "drap", "drop", "sort"],
"grabber": ["mover", "drag", "drop", "sort"],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably the scariest change.

"graph": ["trend", "stats", "statistics"],
"heart": ["love", "beat"],
"heart-outline": ["love", "beat"],
Expand Down
4 changes: 2 additions & 2 deletions lib/octicons_jekyll/lib/jekyll-octicons.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Octicons < Liquid::Tag
# Syntax for the octicon symbol
Syntax = /\A(#{Liquid::VariableSignature}+)/

# For interpoaltion, look for liquid variables
# For interpolation, look for liquid variables
Variable = /\{\{\s*([\w]+\.?[\w]*)\s*\}\}/i

# Copied from Liquid::TagAttributes to allow dashes in tag names:
Expand All @@ -23,7 +23,7 @@ def initialize(tag_name, markup, options)
super
@markup = markup

# If there's interpoaltion going on, we need to do this in render
# If there's interpolation going on, we need to do this in render
prepare(markup) unless match = markup.match(Variable)
end

Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/test/octicon_tag_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
assert_match /aria-label="hi"/, output
end

it "parses interpoaltion of variables" do
it "parses interpolation of variables" do
template = render("{% assign symbol = \"mark-github\" %}{% octicon {{ symbol }} %}")
assert_match /<svg.*octicon-mark-github.*/, template
end
Expand Down
4 changes: 2 additions & 2 deletions script/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const {argv} = yargs
.option('output', {
alias: 'o',
type: 'string',
describe: 'Ouput JSON file. Defaults to stdout if no output file is provided.'
describe: 'Output JSON file. Defaults to stdout if no output file is provided.'
})

// The `argv.input` array could contain globs (e.g. "**/*.svg").
Expand Down Expand Up @@ -105,7 +105,7 @@ const icons = svgFilepaths.map(filepath => {
// Instead of exiting immediately, we set exitCode to 1 and continue
// iterating through the rest of the SVGs. This allows us to identify all
// the SVGs that have errors, not just the first one. An exit code of 1
// indicates that an error occured.
// indicates that an error occurred.
// Reference: https://nodejs.org/api/process.html#process_exit_codes
exitCode = 1
return null
Expand Down