From 70dad77b96baeda926e9b28ed8e7cdbe7ab63764 Mon Sep 17 00:00:00 2001
From: lukedukeus <vanzweden1@gmail.com>
Date: Tue, 18 Mar 2025 08:43:37 -0400
Subject: [PATCH] feat(icons): updates `filter` & adds `filter-plus` icon
 (#2917)

* Added icons/filter-add.svg

* Added icons/filter-add.json

* add contributors

* rename according to naming conventions

* add missing tags

* fill gap between plus sign and funnel

* Update icons/filter-plus.svg

Co-authored-by: Karsa <contact@karsa.org>

* update filter icons

* rename filter to funnel

* tidy up

* Update funnel.svg

* Update funnel-x.svg

* Update funnel-plus.svg

* Update funnel-x.json

* Update funnel.json

* Update funnel-x.json

* Update funnel.json

* Update funnel-plus.json

---------

Co-authored-by: Karsa <contact@karsa.org>
---
 icons/filter-x.json                   | 14 --------------
 icons/filter.json                     | 13 -------------
 icons/funnel-plus.json                | 20 ++++++++++++++++++++
 icons/{filter.svg => funnel-plus.svg} |  4 +++-
 icons/funnel-x.json                   | 27 +++++++++++++++++++++++++++
 icons/funnel-x.svg                    | 15 +++++++++++++++
 icons/funnel.json                     | 24 ++++++++++++++++++++++++
 icons/{filter-x.svg => funnel.svg}    |  4 +---
 8 files changed, 90 insertions(+), 31 deletions(-)
 delete mode 100644 icons/filter-x.json
 delete mode 100644 icons/filter.json
 create mode 100644 icons/funnel-plus.json
 rename icons/{filter.svg => funnel-plus.svg} (51%)
 create mode 100644 icons/funnel-x.json
 create mode 100644 icons/funnel-x.svg
 create mode 100644 icons/funnel.json
 rename icons/{filter-x.svg => funnel.svg} (56%)

diff --git a/icons/filter-x.json b/icons/filter-x.json
deleted file mode 100644
index f26d6e8e2..000000000
--- a/icons/filter-x.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "gubser",
-    "ericfennis"
-  ],
-  "tags": [
-    "funnel",
-    "hopper"
-  ],
-  "categories": [
-    "layout"
-  ]
-}
diff --git a/icons/filter.json b/icons/filter.json
deleted file mode 100644
index 7d5994145..000000000
--- a/icons/filter.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "colebemis"
-  ],
-  "tags": [
-    "funnel",
-    "hopper"
-  ],
-  "categories": [
-    "layout"
-  ]
-}
diff --git a/icons/funnel-plus.json b/icons/funnel-plus.json
new file mode 100644
index 000000000..9eb3241ee
--- /dev/null
+++ b/icons/funnel-plus.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "gubser",
+    "ericfennis",
+    "lukedukeus",
+    "jguddas",
+    "karsa-mistmere"
+  ],
+  "tags": [
+    "filter",
+    "hopper",
+    "add",
+    "create",
+    "new"
+  ],
+  "categories": [
+    "layout"
+  ]
+}
diff --git a/icons/filter.svg b/icons/funnel-plus.svg
similarity index 51%
rename from icons/filter.svg
rename to icons/funnel-plus.svg
index adc513ca9..90726251d 100644
--- a/icons/filter.svg
+++ b/icons/funnel-plus.svg
@@ -9,5 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3" />
+  <path d="M13.354 3H3a1 1 0 0 0-.742 1.67l7.225 7.989A2 2 0 0 1 10 14v6a1 1 0 0 0 .553.895l2 1A1 1 0 0 0 14 21v-7a2 2 0 0 1 .517-1.341l1.218-1.348" />
+  <path d="M16 6h6" />
+  <path d="M19 3v6" />
 </svg>
diff --git a/icons/funnel-x.json b/icons/funnel-x.json
new file mode 100644
index 000000000..7e7897e5c
--- /dev/null
+++ b/icons/funnel-x.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "gubser",
+    "ericfennis",
+    "lukedukeus",
+    "jguddas",
+    "karsa-mistmere"
+  ],
+  "tags": [
+    "filter",
+    "hopper",
+    "remove",
+    "delete"
+  ],
+  "categories": [
+    "layout"
+  ],
+  "aliases": [
+    {
+      "name": "filter-x",
+      "deprecated": true,
+      "deprecationReason": "alias.name",
+      "toBeRemovedInVersion": "v1.0"
+    }
+  ]
+}
diff --git a/icons/funnel-x.svg b/icons/funnel-x.svg
new file mode 100644
index 000000000..05e772b35
--- /dev/null
+++ b/icons/funnel-x.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12.531 3H3a1 1 0 0 0-.742 1.67l7.225 7.989A2 2 0 0 1 10 14v6a1 1 0 0 0 .553.895l2 1A1 1 0 0 0 14 21v-7a2 2 0 0 1 .517-1.341l.427-.473" />
+  <path d="m16.5 3.5 5 5" />
+  <path d="m21.5 3.5-5 5" />
+</svg>
diff --git a/icons/funnel.json b/icons/funnel.json
new file mode 100644
index 000000000..f214516f7
--- /dev/null
+++ b/icons/funnel.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "colebemis",
+    "lukedukeus",
+    "jguddas",
+    "karsa-mistmere"
+  ],
+  "tags": [
+    "filter",
+    "hopper"
+  ],
+  "categories": [
+    "layout"
+  ],
+  "aliases": [
+    {
+      "name": "filter",
+      "deprecated": true,
+      "deprecationReason": "alias.name",
+      "toBeRemovedInVersion": "v1.0"
+    }
+  ]
+}
diff --git a/icons/filter-x.svg b/icons/funnel.svg
similarity index 56%
rename from icons/filter-x.svg
rename to icons/funnel.svg
index ea922e29d..97326b5cb 100644
--- a/icons/filter-x.svg
+++ b/icons/funnel.svg
@@ -9,7 +9,5 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M13.013 3H2l8 9.46V19l4 2v-8.54l.9-1.055" />
-  <path d="m22 3-5 5" />
-  <path d="m17 3 5 5" />
+  <path d="M10 20a1 1 0 0 0 .553.895l2 1A1 1 0 0 0 14 21v-7a2 2 0 0 1 .517-1.341L21.74 4.67A1 1 0 0 0 21 3H3a1 1 0 0 0-.742 1.67l7.225 7.989A2 2 0 0 1 10 14z" />
 </svg>