From 13c66aeddc0735279f9b68b5222d3e56baa5fcb9 Mon Sep 17 00:00:00 2001 From: "primer[bot]" <119360173+primer[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:41:47 -0700 Subject: [PATCH 1/2] Version Packages (#985) Co-authored-by: github-actions[bot] --- .changeset/mean-paws-tease.md | 5 ----- CHANGELOG.md | 6 ++++++ lib/octicons_gem/lib/octicons/version.rb | 2 +- lib/octicons_helper/Gemfile | 2 +- lib/octicons_helper/lib/octicons_helper/version.rb | 2 +- lib/octicons_helper/octicons_helper.gemspec | 2 +- lib/octicons_jekyll/Gemfile | 2 +- lib/octicons_jekyll/jekyll-octicons.gemspec | 2 +- lib/octicons_jekyll/lib/jekyll-octicons/version.rb | 2 +- lib/octicons_node/package.json | 2 +- lib/octicons_react/package.json | 2 +- package.json | 2 +- 12 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 .changeset/mean-paws-tease.md diff --git a/.changeset/mean-paws-tease.md b/.changeset/mean-paws-tease.md deleted file mode 100644 index 1122b7901..000000000 --- a/.changeset/mean-paws-tease.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@primer/octicons": minor ---- - -Fix Feed icon alignment issue and name collision diff --git a/CHANGELOG.md b/CHANGELOG.md index b2ca22a57..ea6082525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 19.7.0 + +### Minor Changes + +- [#980](https://github.com/primer/octicons/pull/980) [`5c207929`](https://github.com/primer/octicons/commit/5c207929bdda29e910f2c5b2f6df9de6ef902b84) Thanks [@gavinmn](https://github.com/gavinmn)! - Fix Feed icon alignment issue and name collision + ## 19.6.0 ### Minor Changes diff --git a/lib/octicons_gem/lib/octicons/version.rb b/lib/octicons_gem/lib/octicons/version.rb index 4badaf7e1..fd7a35e2d 100644 --- a/lib/octicons_gem/lib/octicons/version.rb +++ b/lib/octicons_gem/lib/octicons/version.rb @@ -1,3 +1,3 @@ module Octicons - VERSION = "19.6.0".freeze + VERSION = "19.7.0".freeze end diff --git a/lib/octicons_helper/Gemfile b/lib/octicons_helper/Gemfile index d9ae1f673..31e1c58f7 100644 --- a/lib/octicons_helper/Gemfile +++ b/lib/octicons_helper/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem "octicons", "19.6.0" +gem "octicons", "19.7.0" gem "rails" group :development, :test do diff --git a/lib/octicons_helper/lib/octicons_helper/version.rb b/lib/octicons_helper/lib/octicons_helper/version.rb index cdcda5b9b..257812c73 100644 --- a/lib/octicons_helper/lib/octicons_helper/version.rb +++ b/lib/octicons_helper/lib/octicons_helper/version.rb @@ -1,3 +1,3 @@ module OcticonsHelper - VERSION = "19.6.0".freeze + VERSION = "19.7.0".freeze end diff --git a/lib/octicons_helper/octicons_helper.gemspec b/lib/octicons_helper/octicons_helper.gemspec index a203cae13..b7f81ba20 100644 --- a/lib/octicons_helper/octicons_helper.gemspec +++ b/lib/octicons_helper/octicons_helper.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] - s.add_dependency "octicons", "19.6.0" + s.add_dependency "octicons", "19.7.0" s.add_dependency "railties" s.add_dependency "actionview" end diff --git a/lib/octicons_jekyll/Gemfile b/lib/octicons_jekyll/Gemfile index af5cc338b..c6037882a 100644 --- a/lib/octicons_jekyll/Gemfile +++ b/lib/octicons_jekyll/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem "octicons", "19.6.0" +gem "octicons", "19.7.0" group :development, :test do gem "minitest" diff --git a/lib/octicons_jekyll/jekyll-octicons.gemspec b/lib/octicons_jekyll/jekyll-octicons.gemspec index def7fc77d..7d74a6a4f 100644 --- a/lib/octicons_jekyll/jekyll-octicons.gemspec +++ b/lib/octicons_jekyll/jekyll-octicons.gemspec @@ -14,5 +14,5 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency "jekyll", ">= 3.6", "< 5.0" - s.add_dependency "octicons", "19.6.0" + s.add_dependency "octicons", "19.7.0" end diff --git a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb index 0f41dbbd3..f6c535c57 100644 --- a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb +++ b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb @@ -3,6 +3,6 @@ module Liquid; class Tag; end; end module Jekyll class Octicons < Liquid::Tag - VERSION = "19.6.0".freeze + VERSION = "19.7.0".freeze end end diff --git a/lib/octicons_node/package.json b/lib/octicons_node/package.json index 446839386..8dea328f2 100644 --- a/lib/octicons_node/package.json +++ b/lib/octicons_node/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons", - "version": "19.6.0", + "version": "19.7.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 481e29d70..56f52eb33 100644 --- a/lib/octicons_react/package.json +++ b/lib/octicons_react/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons-react", - "version": "19.6.0", + "version": "19.7.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 232d0c678..6ad775cf2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@primer/octicons", - "version": "19.6.0", + "version": "19.7.0", "publishConfig": { "registry": "no registry, don't publish from this package.json." }, From 15ea1e43510a55a5f77d4f4bc76f5033d6655997 Mon Sep 17 00:00:00 2001 From: UnicodeRogue <49918839+UnicodeRogue@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:44:32 -0400 Subject: [PATCH 2/2] Octicon contribution for RemoveFilter (#976) * Octicon contribution for RemoveFilter * taking out props * adding note about note * Optimize SVGs * adding 24 size version * changeset run and message added * updated snapshot for test passing * Updating filter-remove icons * Optimize SVGs --------- Co-authored-by: UnicodeRogue Co-authored-by: Cameron Foxly Co-authored-by: Gregor Martynus <39992+gr2m@users.noreply.github.com> --- .changeset/hip-fishes-rush.md | 5 +++++ icons/filter-remove-16.svg | 1 + icons/filter-remove-24.svg | 1 + keywords.json | 1 + .../__tests__/__snapshots__/public-api.test.js.snap | 1 + 5 files changed, 9 insertions(+) create mode 100644 .changeset/hip-fishes-rush.md create mode 100644 icons/filter-remove-16.svg create mode 100644 icons/filter-remove-24.svg diff --git a/.changeset/hip-fishes-rush.md b/.changeset/hip-fishes-rush.md new file mode 100644 index 000000000..237bb5486 --- /dev/null +++ b/.changeset/hip-fishes-rush.md @@ -0,0 +1,5 @@ +--- +'@primer/octicons': minor +--- + +Adds filter remove octicon diff --git a/icons/filter-remove-16.svg b/icons/filter-remove-16.svg new file mode 100644 index 000000000..c63267048 --- /dev/null +++ b/icons/filter-remove-16.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/filter-remove-24.svg b/icons/filter-remove-24.svg new file mode 100644 index 000000000..33f7c9967 --- /dev/null +++ b/icons/filter-remove-24.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/keywords.json b/keywords.json index 8747421c1..a35b75d69 100644 --- a/keywords.json +++ b/keywords.json @@ -75,6 +75,7 @@ "file-symlink-directory": ["folder", "subfolder", "link", "alias"], "file-symlink-file": ["link", "alias"], "file-zip": ["compress", "archive"], + "filter-remove": ["funnel", "filter", "remove", "delete"], "fiscal-host": ["safe", "money"], "flame": ["fire", "hot", "burn", "trending"], "fold": ["unfold", "hide", "collapse"], diff --git a/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap b/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap index ae06643d4..23691a221 100644 --- a/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap +++ b/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap @@ -132,6 +132,7 @@ exports[`@primer/octicons-react should not update exports without a semver chang "FileSymlinkFileIcon", "FileZipIcon", "FilterIcon", + "FilterRemoveIcon", "FiscalHostIcon", "FlameIcon", "FoldDownIcon",