From 3a6d629e97f26ec4eb5047f901d2542d3e288615 Mon Sep 17 00:00:00 2001 From: Eric Schubert Date: Mon, 29 Apr 2024 15:28:11 +0200 Subject: [PATCH 1/4] [#54503] added 5 more icons for usage in 3d viewer --- .changeset/fifty-foxes-shake.md | 5 ++++ CONTRIBUTING.md | 29 ++++++++++++------------ icons/op-3d-return-default-16.svg | 11 +++++++++ icons/op-first-person-view-16.svg | 11 +++++++++ icons/op-orthographic-perspective-16.svg | 12 ++++++++++ icons/op-view-3d-16.svg | 10 ++++++++ icons/op-view-fit-to-16.svg | 13 +++++++++++ keywords.json | 5 ++++ 8 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 .changeset/fifty-foxes-shake.md create mode 100644 icons/op-3d-return-default-16.svg create mode 100644 icons/op-first-person-view-16.svg create mode 100644 icons/op-orthographic-perspective-16.svg create mode 100644 icons/op-view-3d-16.svg create mode 100644 icons/op-view-fit-to-16.svg diff --git a/.changeset/fifty-foxes-shake.md b/.changeset/fifty-foxes-shake.md new file mode 100644 index 000000000..413ee34d9 --- /dev/null +++ b/.changeset/fifty-foxes-shake.md @@ -0,0 +1,5 @@ +--- +'@openproject/octicons': minor +--- + +Added 5 new icons for 3d viewer actions diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c37007e2..9f8431ea8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,21 +52,19 @@ attributes, as those are removed by the CI step "Optimize SVGs". ``` ### 5. Create and push a changeset -For release dependent Pull Requests, add a changeset file to your Pull Request. These files are needed for the release process managed by [Changesets](https://github.com/changesets/changesets#readme). +For release dependent Pull Requests, add a changeset file to your Pull Request. These files are needed for the release +process managed by [Changesets](https://github.com/changesets/changesets#readme). 1. Install (if you have not done before) -```shell -npm install @changesets/cli && npx changeset init -``` - + ```shell + npm install @changesets/cli && npx changeset init + ``` 2. Create a changeset -```shell -npx changeset -``` - + ```shell + npx changeset + ``` 3. Select version type (patch, minor, major) -4. Type a message explaining your changes (equivalent to release notes) - +4. Type a message explaining your changes (equivalent to release notes) ### 6. Commit and push changes @@ -78,13 +76,16 @@ git push ### 7. 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. +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. +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. ## Other contributions -When contributing to Octicons outside of adding a new icon or release-dependent contribution, you don't have to add a _Changeset_ file. +When contributing to Octicons outside of adding a new icon or release-dependent contribution, you don't have to add a +_Changeset_ file. Examples of other contributions include adding documentation or improving a GitHub Actions workflows. diff --git a/icons/op-3d-return-default-16.svg b/icons/op-3d-return-default-16.svg new file mode 100644 index 000000000..671281f35 --- /dev/null +++ b/icons/op-3d-return-default-16.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/icons/op-first-person-view-16.svg b/icons/op-first-person-view-16.svg new file mode 100644 index 000000000..b4620d8b0 --- /dev/null +++ b/icons/op-first-person-view-16.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/icons/op-orthographic-perspective-16.svg b/icons/op-orthographic-perspective-16.svg new file mode 100644 index 000000000..864bb7d1a --- /dev/null +++ b/icons/op-orthographic-perspective-16.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icons/op-view-3d-16.svg b/icons/op-view-3d-16.svg new file mode 100644 index 000000000..cf79068ac --- /dev/null +++ b/icons/op-view-3d-16.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icons/op-view-fit-to-16.svg b/icons/op-view-fit-to-16.svg new file mode 100644 index 000000000..8b170acc0 --- /dev/null +++ b/icons/op-view-fit-to-16.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/keywords.json b/keywords.json index 93811603d..a75f0a27b 100644 --- a/keywords.json +++ b/keywords.json @@ -145,10 +145,15 @@ "north-star": ["star", "snowflake", "asterisk"], "note": ["card", "paper", "ticket"], "octoface": ["octocat", "brand"], + "op-3d-return-default": ["reset", "cube"], "op-cursor-rectangle-select": ["group", "select"], "op-cursor-select": ["pointer", "select", "mouse"], "op-erase": ["remove", "delete"], + "op-first-person": ["person", "human", "ego-perspective"], + "op-orthographic-perspective": ["3d", "threed", "camera", "view"], "op-scissors": ["cut", "snip", "slice", "clip"], + "op-view-3d": ["3d", "threed"], + "op-view-fit-to": ["rectangle", "fit", "frame", "view"], "organization": ["people", "group", "team"], "package": ["box", "ship"], "paintcan": ["style", "theme", "art", "color"], From d38039e8207978844e6e84f5fad4bb351e4364cb Mon Sep 17 00:00:00 2001 From: Eric Schubert Date: Mon, 29 Apr 2024 13:31:14 +0000 Subject: [PATCH 2/4] Optimize SVGs --- icons/op-3d-return-default-16.svg | 12 +----------- icons/op-first-person-view-16.svg | 12 +----------- icons/op-orthographic-perspective-16.svg | 13 +------------ icons/op-view-3d-16.svg | 11 +---------- icons/op-view-fit-to-16.svg | 14 +------------- 5 files changed, 5 insertions(+), 57 deletions(-) diff --git a/icons/op-3d-return-default-16.svg b/icons/op-3d-return-default-16.svg index 671281f35..7d519c7b8 100644 --- a/icons/op-3d-return-default-16.svg +++ b/icons/op-3d-return-default-16.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/icons/op-first-person-view-16.svg b/icons/op-first-person-view-16.svg index b4620d8b0..0cbc869be 100644 --- a/icons/op-first-person-view-16.svg +++ b/icons/op-first-person-view-16.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/icons/op-orthographic-perspective-16.svg b/icons/op-orthographic-perspective-16.svg index 864bb7d1a..0eaf6e1cd 100644 --- a/icons/op-orthographic-perspective-16.svg +++ b/icons/op-orthographic-perspective-16.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/icons/op-view-3d-16.svg b/icons/op-view-3d-16.svg index cf79068ac..829b8397b 100644 --- a/icons/op-view-3d-16.svg +++ b/icons/op-view-3d-16.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/icons/op-view-fit-to-16.svg b/icons/op-view-fit-to-16.svg index 8b170acc0..2a9f0bf79 100644 --- a/icons/op-view-fit-to-16.svg +++ b/icons/op-view-fit-to-16.svg @@ -1,13 +1 @@ - - - - - - - - - - - - - + \ No newline at end of file From 6561c6444bb2149d239263e0fc9ababe3bd2b11d Mon Sep 17 00:00:00 2001 From: Eric Schubert Date: Mon, 29 Apr 2024 15:42:21 +0200 Subject: [PATCH 3/4] [#54503] trigger CI From da9dee8b94d48ca59e39df207c8f75de9cc15b76 Mon Sep 17 00:00:00 2001 From: Eric Schubert Date: Mon, 29 Apr 2024 16:09:06 +0200 Subject: [PATCH 4/4] [#54503] fixed naming for icons - no starting numbers, to satisfy angular package build --- ...-return-default-16.svg => op-threed-return-default-16.svg} | 0 icons/{op-view-3d-16.svg => op-view-threed-16.svg} | 0 keywords.json | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename icons/{op-3d-return-default-16.svg => op-threed-return-default-16.svg} (100%) rename icons/{op-view-3d-16.svg => op-view-threed-16.svg} (100%) diff --git a/icons/op-3d-return-default-16.svg b/icons/op-threed-return-default-16.svg similarity index 100% rename from icons/op-3d-return-default-16.svg rename to icons/op-threed-return-default-16.svg diff --git a/icons/op-view-3d-16.svg b/icons/op-view-threed-16.svg similarity index 100% rename from icons/op-view-3d-16.svg rename to icons/op-view-threed-16.svg diff --git a/keywords.json b/keywords.json index a75f0a27b..2a7cd7eb3 100644 --- a/keywords.json +++ b/keywords.json @@ -145,15 +145,15 @@ "north-star": ["star", "snowflake", "asterisk"], "note": ["card", "paper", "ticket"], "octoface": ["octocat", "brand"], - "op-3d-return-default": ["reset", "cube"], "op-cursor-rectangle-select": ["group", "select"], "op-cursor-select": ["pointer", "select", "mouse"], "op-erase": ["remove", "delete"], "op-first-person": ["person", "human", "ego-perspective"], "op-orthographic-perspective": ["3d", "threed", "camera", "view"], "op-scissors": ["cut", "snip", "slice", "clip"], - "op-view-3d": ["3d", "threed"], + "op-threed-return-default": ["reset", "cube"], "op-view-fit-to": ["rectangle", "fit", "frame", "view"], + "op-view-threed": ["3d", "threed"], "organization": ["people", "group", "team"], "package": ["box", "ship"], "paintcan": ["style", "theme", "art", "color"],