From 0f2a2ff941989039190030168579fd7976c5b0f1 Mon Sep 17 00:00:00 2001 From: "primer[bot]" <119360173+primer[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:20:05 +0200 Subject: [PATCH 1/3] Version Packages (#1029) Co-authored-by: github-actions[bot] --- .changeset/hungry-poems-provide.md | 5 ----- CHANGELOG.md | 6 ++++++ lib/octicons_node/package.json | 2 +- lib/octicons_react/package.json | 2 +- package.json | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 .changeset/hungry-poems-provide.md diff --git a/.changeset/hungry-poems-provide.md b/.changeset/hungry-poems-provide.md deleted file mode 100644 index 68d615358..000000000 --- a/.changeset/hungry-poems-provide.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@primer/octicons": minor ---- - -Adding ai-model icon at 16 & 24px diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b74e86c..ea351b403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 19.11.0 + +### Minor Changes + +- [#1028](https://github.com/primer/octicons/pull/1028) [`d27ea2f6`](https://github.com/primer/octicons/commit/d27ea2f6b52c5d26d4118259c86e4c91e58cfd56) Thanks [@CameronFoxly](https://github.com/CameronFoxly)! - Adding ai-model icon at 16 & 24px + ## 19.10.0 ### Minor Changes diff --git a/lib/octicons_node/package.json b/lib/octicons_node/package.json index a1a1b7d1e..25f74140c 100644 --- a/lib/octicons_node/package.json +++ b/lib/octicons_node/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons", - "version": "19.10.0", + "version": "19.11.0", "description": "A scalable set of icons handcrafted with <3 by GitHub.", "homepage": "https://primer.style/octicons", "author": "GitHub Inc.", diff --git a/lib/octicons_react/package.json b/lib/octicons_react/package.json index 9e4ae043e..d559859dc 100644 --- a/lib/octicons_react/package.json +++ b/lib/octicons_react/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons-react", - "version": "19.10.0", + "version": "19.11.0", "description": "A scalable set of icons handcrafted with <3 by GitHub.", "homepage": "https://primer.style/octicons", "author": "GitHub, Inc.", diff --git a/package.json b/package.json index ed8b975e0..9b0dcb8bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons", - "version": "19.10.0", + "version": "19.11.0", "publishConfig": { "registry": "no registry, don't publish from this package.json." }, From 89953c8a61c9ead66931465f248856723245f3d1 Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Wed, 18 Sep 2024 11:31:54 -0400 Subject: [PATCH 2/3] Update CONTRIBUTING.md Porting Octicon contribution guidelines from Primer docs --- CONTRIBUTING.md | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 52243226a..ea1ae9d99 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,7 +30,9 @@ Thank you for your interest in contributing to Octicons! We are currently only a Follow these steps to add or update an icon. -### 1. Clone the repository +### Manually with SVG files + +#### 1. Clone the repository ```shell # Clone the repository @@ -53,15 +55,15 @@ cd octicons git remote add upstream https://github.com/primer/octicons ``` -### 2. Create a new feature branch +#### 2. Create a new feature branch ```shell git checkout -b ``` -### 3. Add or update SVG files in the `/icons` directory +#### 3. Add or update SVG files in the `/icons` directory -### 4. Add or update keywords in `keywords.json` +#### 4. Add or update keywords in `keywords.json` ```diff { @@ -70,7 +72,7 @@ git checkout -b } ``` -### 5. Commit and push changes +#### 5. Commit and push changes ```shell git add . @@ -78,12 +80,37 @@ git commit -m git push ``` -### 6. Create a pull request +#### 6. Create a pull request Use GitHub to [create a pull request](https://help.github.com/en/desktop/contributing-to-projects/creating-a-pull-request) for your branch. In your pull request description, be sure to mention where the icon will be used and any relevant timeline information. If everything looks good, a maintainer will approve and merge the pull request when appropriate. After the pull request is merged, your icon will be available in the next Octicons release. +### Using the Octicons Push Figma plugin + +If you work at GitHub, you can use the [Octicons Push](https://www.figma.com/community/plugin/825432045044458754/Octicons-Push) Figma plugin to start an Octicons pull request from Figma. + +Here's how it works: + +1. Select the icon frames you want to commit. Make sure the frames are either 16x16 or 24x24 and that you've outlined all strokes. +2. Open the Octicons Push plugin. +3. Select the branch you want to commit to. You can choose an existing branch or create a new branch. +4. Press "Commit." The plugin will then export, commit, and push the selected icons to the branch you chose. If you chose to create a new branch, the plugin will give you a link to where you can start a new pull request with your branch. + +After you create a pull request, a member of the Design Infrastructure team will triage and review your contribution. + +![demo showing how to create a pull request using the Octicons Push Figma plugin](https://user-images.githubusercontent.com/4608155/77948730-b1a24600-727a-11ea-9c39-040be9a12963.gif) + +## How changes are reviewed + +Here are a few questions we'll ask when reviewing new octicons. Keep these in mind as you're designing: + +- Where will this icon be used in the context of GitHub UI? +- Is an icon necessary in that context? +- Could we use an existing icon? +- Is the icon trying to represent too many ideas? +- Does it follow the design guidelines? + ## Releasing changes Once submitted changes have been agreed upon, these instructions will guide maintainers through releasing changes. From 7a5ac85800359eb1ee6c98c90533c5f344e6532d Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Mon, 7 Oct 2024 14:36:47 -0700 Subject: [PATCH 3/3] Update thumbsup and thumbsdown icons (#1033) * Save thumbsup-16.svg * Optimize SVGs * Save thumbsdown-16.svg * Save thumbsup-24.svg * Optimize SVGs * Save thumbsdown-24.svg * Optimize SVGs * Create silent-rivers-eat.md * Save thumbsup-24.svg * Optimize SVGs --------- Co-authored-by: Cole Bemis --- .changeset/silent-rivers-eat.md | 5 +++++ icons/thumbsdown-16.svg | 2 +- icons/thumbsdown-24.svg | 2 +- icons/thumbsup-16.svg | 2 +- icons/thumbsup-24.svg | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changeset/silent-rivers-eat.md diff --git a/.changeset/silent-rivers-eat.md b/.changeset/silent-rivers-eat.md new file mode 100644 index 000000000..8cfc00f0a --- /dev/null +++ b/.changeset/silent-rivers-eat.md @@ -0,0 +1,5 @@ +--- +"@primer/octicons": minor +--- + +Update `thumbsup` and `thumbsdown` icons diff --git a/icons/thumbsdown-16.svg b/icons/thumbsdown-16.svg index f400783e4..be54cb71b 100644 --- a/icons/thumbsdown-16.svg +++ b/icons/thumbsdown-16.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/thumbsdown-24.svg b/icons/thumbsdown-24.svg index 2d0526e4b..2c290998d 100644 --- a/icons/thumbsdown-24.svg +++ b/icons/thumbsdown-24.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/thumbsup-16.svg b/icons/thumbsup-16.svg index 59d61e67d..3e837d1c1 100644 --- a/icons/thumbsup-16.svg +++ b/icons/thumbsup-16.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/thumbsup-24.svg b/icons/thumbsup-24.svg index f16dda83b..0e50c53df 100644 --- a/icons/thumbsup-24.svg +++ b/icons/thumbsup-24.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file