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

fix(icons): combined layers and layers-3 icon #2596

Merged
merged 6 commits into from
Dec 3, 2024
Merged

fix(icons): combined layers and layers-3 icon #2596

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37d7be6
Updated icons/layers.svg
jguddas Nov 9, 2024
443d820
Updated icons/layers.json
jguddas Nov 9, 2024
8774d42
chore: removed layers-3 icon
jguddas Nov 9, 2024
c715eb5
Update tools/build-icons/utils/deprecationReasonTemplate.mjs
jguddas Nov 9, 2024
ba0d9c4
Merge branch 'main' into studio/layers
jguddas Nov 9, 2024
168622e
Merge branch 'main' into studio/layers
ericfennis Nov 15, 2024
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 icon.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
},
"aliasDeprecationReasons": {
"type": "string",
"enum": ["alias.typo", "alias.name"]
"enum": ["alias.typo", "alias.name", "alias.duplicate"]
},
"versionNumber": {
"type": "string",
Expand Down
21 changes: 0 additions & 21 deletions icons/layers-3.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions icons/layers-3.svg
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion icons/layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"$schema": "../icon.schema.json",
"contributors": [
"colebemis",
"danielbayley"
"danielbayley",
"jguddas"
],
"tags": [

Check notice on line 8 in icons/layers.json

View workflow job for this annotation

GitHub Actions / lint-contributors

Contributors have changed! 

Don't add people who have only performed automatic optimizations.

+  "aliases": [
+    {
+      "name": "layers-3",
+      "deprecationReason": "alias.duplicate"
+    }
+  ],
@@ -20,6 +25,0 @@
-  ],
-  "aliases": [
-    {
-      "name": "layers-3",
-      "deprecationReason": "alias.duplicate"
-    }
"stack",
"pile",
"pages",
Expand All @@ -16,5 +17,11 @@
"categories": [
"design",
"layout"
],
"aliases": [
{
"name": "layers-3",
"deprecationReason": "alias.duplicate"
}
]
}
6 changes: 3 additions & 3 deletions icons/layers.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions tools/build-icons/utils/deprecationReasonTemplate.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export function deprecationReasonTemplate(
switch (deprecationReason) {
case 'alias.typo':
return `Renamed because of typo, use {@link ${componentName}} instead.${removalNotice}`;
case 'alias.duplicate':
return `The icon was combined with another icon that shared the same usecase, use {@link ${componentName}} instead.${removalNotice}`;
jguddas marked this conversation as resolved.
Show resolved Hide resolved
case 'alias.naming':
return `The name of this icon was changed because it didn't meet our guidelines anymore, use {@link ${componentName}} instead.${removalNotice}`;
case 'icon.brand':
Expand Down
Loading