From bdf1fa3d150c09a17f3ef5ff408433487c53fb19 Mon Sep 17 00:00:00 2001 From: Daniel Wilkowski Date: Fri, 11 Oct 2024 21:33:34 +0200 Subject: [PATCH] Unify icons --- app/Domain/Icon/FontAwesomeFree.php | 3 +- app/Domain/Icon/FontAwesomePro.php | 100 ++++++++++++----------- app/Domain/Icon/Icons.php | 6 +- resources/js/components/forum/post.vue | 14 ++-- resources/js/components/progress-bar.vue | 6 +- resources/sass/icons/_icons.scss | 36 ++++++++ resources/views/job/partials/offer.twig | 6 +- survey/src/screen/steps/badge.ts | 2 +- 8 files changed, 107 insertions(+), 66 deletions(-) diff --git a/app/Domain/Icon/FontAwesomeFree.php b/app/Domain/Icon/FontAwesomeFree.php index 026a3e4d1..ed2df4fd3 100644 --- a/app/Domain/Icon/FontAwesomeFree.php +++ b/app/Domain/Icon/FontAwesomeFree.php @@ -362,7 +362,8 @@ public function icons(): array "jobOfferPublishDate" => "fas fa-calendar-days", "jobOfferRemove" => "fas fa-trash-can", "jobOfferReport" => "fas fa-flag", - "jobOfferRequirementProgress" => "fas fa-circle", + "jobOfferRequirementRank" => 'fas fa-circle', + "jobOfferRequirementRanked" => 'fas fa-circle', "jobOfferSeniority" => "fas fa-fw fa-chart-line", "jobOfferSubscribe" => "fa-regular fa-bell", "jobOfferSubscribed" => "fa-solid fa-bell", diff --git a/app/Domain/Icon/FontAwesomePro.php b/app/Domain/Icon/FontAwesomePro.php index a532cc31e..083fc9fc1 100644 --- a/app/Domain/Icon/FontAwesomePro.php +++ b/app/Domain/Icon/FontAwesomePro.php @@ -29,9 +29,9 @@ public function icons(): array 'loginGithub' => 'fa-brand fa-github', // homepage - 'microblogsPopular' => 'fa-light fa-comments', - 'reputationRanking' => 'fa-light fa-star', - 'forumNews' => 'fa-light fa-star', + 'microblogsPopular' => 'fa-light fa-fire-flame-curved', + 'reputationRanking' => 'fa-light fa-trophy', + 'forumNews' => 'fa-light fa-inbox-in', 'viewersOnlineLocal' => 'fa-light fa-eye', 'viewersOnlineGlobal' => 'fa-light fa-users', 'homepageActivityMicroblog' => 'fa-light fa-person', @@ -40,7 +40,7 @@ public function icons(): array 'homepageActivityPost' => 'fa-light fa-file-lines', // microblog page - 'recommendedUsers' => 'fa-light fa-tag', + 'recommendedUsers' => 'fa-light fa-user-tag', // microblog 'microblogNew' => 'fa-light fa-plus', @@ -48,34 +48,34 @@ public function icons(): array 'microblogReport' => 'fa-light fa-flag', 'microblogShare' => 'fa-light fa-share-nodes', 'microblogAddComment' => 'fa-light fa-comment', - 'microblogVote' => 'fa-light fa-thumbs-up', - 'microblogVoted' => 'fa-solid fa-thumbs-up', + 'microblogVote' => 'fa-light fa-heart', + 'microblogVoted' => 'fa-solid fa-heart', 'microblogSubscribe' => 'fa-light fa-bell', 'microblogSubscribed' => 'fa-solid fa-bell', - 'microblogFoldedUnfold' => 'fa-light fa-circle-right', + 'microblogFoldedUnfold' => 'fa-light fa-circle-ellipsis', 'microblogCommentsFoldedUnfold' => 'fa-light fa-comments', - 'microblogBlockAuthor' => 'fa-light fa-user-slash', - 'microblogEdit' => 'fa-light fa-pen-to-square', + 'microblogBlockAuthor' => 'fa-light fa-lock', + 'microblogEdit' => 'fa-light fa-edit', 'microblogDelete' => 'fa-light fa-trash-can', - 'microblogRestore' => 'fa-light fa-trash-arrow-up', - 'microblogSponsored' => 'fa-light fa-dollar-sign', + 'microblogRestore' => 'fa-light fa-trash-can-undo', + 'microblogSponsored' => 'fa-light fa-circle-dollar', 'microblogMenuDropdown' => $genericDropdown, // microblog comment - 'microblogCommentEdit' => 'fa-light fa-pen-to-square', + 'microblogCommentEdit' => 'fa-light fa-edit', 'microblogCommentDelete' => 'fa-light fa-trash-can', - 'microblogCommentRestore' => 'fa-light fa-trash-arrow-up', - 'microblogCommentBlockAuthor' => 'fa-light fa-user-slash', - 'microblogCommentNewSave' => 'fa-light fa-share-from-square', - 'microblogCommentMenuEditRemove' => 'fa-light fa-bars', - 'microblogCommentMenuAnswerFlag' => $genericDropdown, + 'microblogCommentRestore' => 'fa-light fa-trash-can-undo', + 'microblogCommentBlockAuthor' => 'fa-light fa-lock', + 'microblogCommentNewSave' => 'fa-light fa-floppy-disk-pen', + 'microblogCommentMenuEditRemove' => 'fa-light fa-bars', // deprecated + 'microblogCommentMenuAnswerFlag' => 'fa-regular fa-ellipsis', // navigation dropdown 'sponsorProfile' => 'fa-light fa-medal', 'userProfile' => 'fa-light fa-user', 'privateMessages' => 'fa-light fa-envelope', 'userAccount' => 'fa-light fa-gear', - 'help' => 'fa-light fa-circle-info', + 'help' => 'fa-light fa-square-question', 'adminPanel' => 'fa-light fa-user-tie', 'logout' => 'fa-light fa-right-from-bracket', @@ -116,7 +116,7 @@ public function icons(): array 'userAccount.accountDelete' => 'fa-light fa-trash-can', // following user - 'userFollow' => $faTick, + 'userFollow' => 'fa-light fa-bell', // report 'reportType.spam' => 'fa-light fa-envelopes-bulk', @@ -144,7 +144,7 @@ public function icons(): array // autocomplete 'autocompleteUserShowProfile' => 'fa-light fa-user', 'autocompleteUserPrivateMessage' => 'fa-light fa-comment', - 'autocompleteUserFindPosts' => 'fa-light fa-magnifying-glass', + 'autocompleteUserFindPosts' => 'fa-light fa-user-magnifying-glass', 'autocompleteUserNoAvatar' => 'fa-light fa-user', 'autocompleteSearch' => 'fa-light fa-magnifying-glass', @@ -152,6 +152,7 @@ public function icons(): array 'tag' => 'fa-light fa-tag', 'tagRemove' => $genericClose, 'tagRank' => 'fa-light fa-circle', + 'tagRanked' => 'fa-solid fa-circle', 'tagPopularInclude' => 'fa-light fa-plus', 'tagPopularMore' => 'fa-light fa-plus', @@ -176,21 +177,21 @@ public function icons(): array 'editorMarkdownHelp' => 'fa-brand fa-markdown', 'editorAssetUpload' => 'fa-light fa-image', 'editorAssetUploading' => $genericUploading, - 'editorControlBold' => 'fa-light fa-bold', - 'editorControlItalics' => 'fa-light fa-italic', - 'editorControlUnderline' => 'fa-light fa-underline', - 'editorControlStrikeThrough' => 'fa-light fa-strikethrough', - 'editorControlHyperlink' => 'fa-light fa-link', - 'editorControlCodeBlock' => 'fa-light fa-code', - 'editorControlImage' => 'fa-light fa-image', - 'editorControlKeyStroke' => 'fa-light fa-keyboard', - 'editorControlListOrdered' => 'fa-light fa-list-ol', - 'editorControlListUnordered' => 'fa-light fa-list-ul', - 'editorControlQuote' => 'fa-light fa-quote-left', - 'editorControlTable' => 'fa-light fa-table', - 'editorControlIndentMore' => 'fa-light fa-indent', - 'editorControlIndentLess' => 'fa-light fa-outdent', - 'editorControlEmoji' => 'fa-light fa-face-smile-beam', + 'editorControlBold' => 'fa-solid fa-bold', + 'editorControlItalics' => 'fa-solid fa-italic', + 'editorControlUnderline' => 'fa-solid fa-underline', + 'editorControlStrikeThrough' => 'fa-solid fa-strikethrough', + 'editorControlHyperlink' => 'fa-solid fa-link', + 'editorControlCodeBlock' => 'fa-solid fa-code', + 'editorControlImage' => 'fa-solid fa-image', + 'editorControlKeyStroke' => 'fa-solid fa-keyboard', + 'editorControlListOrdered' => 'fa-solid fa-list-ol', + 'editorControlListUnordered' => 'fa-solid fa-list-ul', + 'editorControlQuote' => 'fa-solid fa-quote-left', + 'editorControlTable' => 'fa-solid fa-table', + 'editorControlIndentMore' => 'fa-solid fa-indent', + 'editorControlIndentLess' => 'fa-solid fa-outdent', + 'editorControlEmoji' => 'fa-solid fa-face-smile-beam', 'editorEmojiPickerClose' => $genericClose, 'editorMarkdownHelpKeyArrowUp' => 'fa-light fa-arrow-up', 'editorMarkdownHelpKeyArrowDown' => 'fa-light fa-arrow-down', @@ -218,10 +219,10 @@ public function icons(): array 'errorPageNeedHelp' => 'fa-light fa-asterisk', // tags - 'tagsSubscribed' => 'fa-light fa-tag', + 'tagsSubscribed' => 'fa-light fa-tags', 'tagsSubscribedEdit' => 'fa-light fa-gear', - 'tagsPopularForum' => 'fa-light fa-tag', - 'tagsPopularMicroblog' => 'fa-light fa-tag', + 'tagsPopularForum' => 'fa-light fa-tags', + 'tagsPopularMicroblog' => 'fa-light fa-tags', 'tagsPopularLanguage' => 'fa-light fa-wrench', // forum @@ -235,15 +236,15 @@ public function icons(): array // topic 'topicSubscribe' => 'fa-light fa-bell', 'topicSubscribed' => 'fa-solid fa-bell', - 'topicLog' => 'fa-light fa-chart-pie', + 'topicLog' => 'fa-light fa-list-check', 'topicGoToBeginning' => 'fa-light fa-backward-fast', 'topicLogBackToTopic' => 'fa-light fa-backward-step', - 'topicActionRename' => 'fa-light fa-pencil', + 'topicActionRename' => 'fa-light fa-pen-line', 'topicActionMove' => 'fa-light fa-circle-arrow-right', 'topicActionLock' => 'fa-light fa-lock', 'topicActionUnlock' => 'fa-light fa-unlock', 'topicAccepted' => $faTick, - 'topicReported' => 'fa-light fa-fire', + 'topicReported' => 'fa-light fa-flag', 'topicStateSticky' => 'fa-light fa-thumbtack', 'topicStateLocked' => 'fa-light fa-lock', 'topicStateStandard' => 'fa-light fa-comments', @@ -270,10 +271,10 @@ public function icons(): array 'postDelete' => 'fa-light fa-trash-can', 'postRestore' => 'fa-light fa-arrow-rotate-left', 'postMentionAuthor' => 'fa-light fa-at', - 'postAnswerQuote' => 'fa-light fa-quote-left', + 'postAnswerQuote' => 'fa-light fa-comment', 'postReport' => 'fa-light fa-flag', 'postMenuDropdown' => $genericDropdown, - 'postMergeWithPrevious' => 'fa-light fa-compress', + 'postMergeWithPrevious' => 'fa-light fa-arrow-up-from-bracket', 'postBanAuthor' => 'fa-light fa-user-slash', 'postDeleted' => 'fa-light fa-trash-can', 'postAuthorBlocked' => 'fa-light fa-user-slash', @@ -307,12 +308,12 @@ public function icons(): array 'profileReputationLose' => 'fa-light fa-level-down', 'profileActions' => 'fa-light fa-handshake-simple', 'profileUserSendMessage' => 'fa-light fa-envelope', - 'profileUserFindPosts' => 'fa-light fa-magnifying-glass', + 'profileUserFindPosts' => 'fa-light fa-user-magnifying-glass', 'profileUserBan' => 'fa-light fa-user-lock', 'profileUserShowInAdmin' => 'fa-light fa-eye', 'profileMenuDropdown' => $genericDropdown, - 'profileUserBlock' => 'fa-light fa-user-slash', - 'profileUserUnblock' => 'fa-light fa-user', + 'profileUserBlock' => 'fa-light fa-lock', + 'profileUserUnblock' => 'fa-light fa-unlock', 'profileUserResidence' => 'fa-light fa-location-dot', 'profileUserWebsite' => 'fa-light fa-globe', 'profileUserGithub' => 'fa-brand fa-github', @@ -362,10 +363,11 @@ public function icons(): array "jobOfferPublishDate" => "fa-light fa-calendar-days", "jobOfferRemove" => "fa-light fa-trash-can", "jobOfferReport" => "fa-light fa-flag", - "jobOfferRequirementProgress" => "fa-light fa-circle", + "jobOfferRequirementRank" => 'fa-light fa-circle', + "jobOfferRequirementRanked" => 'fa-solid fa-circle', "jobOfferSeniority" => "fa-light fa-fw fa-chart-line", - "jobOfferSubscribe" => "fa-light fa-bell", - "jobOfferSubscribed" => "fa-solid fa-bell", + "jobOfferSubscribe" => "fa-light fa-heart", + "jobOfferSubscribed" => "fa-solid fa-heart", "jobOfferViews" => "fa-light fa-eye", "jobOfferCompanyEmployees" => "fa-light fa-users", "jobOfferCompanyEstablishmentYear" => "fa-light fa-calendar", diff --git a/app/Domain/Icon/Icons.php b/app/Domain/Icon/Icons.php index e2a5bb83b..64165cc47 100644 --- a/app/Domain/Icon/Icons.php +++ b/app/Domain/Icon/Icons.php @@ -26,12 +26,12 @@ public function iconSpin(string $iconName): Html private function iconWithClass(string $iconName, string $modifierClass): Html { $class = $this->iconClass($iconName); - return $this->iconTag("$class $modifierClass"); + return $this->iconTag("$class $modifierClass", $iconName); } - private function iconTag(string $class): Html + private function iconTag(string $class, string $iconName): Html { - return new StringHtml(\sPrintF('', $class)); + return new StringHtml(\sPrintF('', $class, $iconName)); } private function iconClass(string $iconName): string diff --git a/resources/js/components/forum/post.vue b/resources/js/components/forum/post.vue index aab9c4527..2bbdab05d 100644 --- a/resources/js/components/forum/post.vue +++ b/resources/js/components/forum/post.vue @@ -236,12 +236,12 @@ - Obserwuj + Obserwuj @@ -261,13 +261,13 @@ - Edytuj + Edytuj diff --git a/resources/js/components/progress-bar.vue b/resources/js/components/progress-bar.vue index f17fbc153..a8e56e5b4 100644 --- a/resources/js/components/progress-bar.vue +++ b/resources/js/components/progress-bar.vue @@ -3,10 +3,12 @@ - + + diff --git a/resources/sass/icons/_icons.scss b/resources/sass/icons/_icons.scss index ec86175a0..7054d1d22 100644 --- a/resources/sass/icons/_icons.scss +++ b/resources/sass/icons/_icons.scss @@ -70,3 +70,39 @@ $icon-category-sort-desc: $fa-var-sort-down; $icon-admin-table-sort: $fa-var-sort; $icon-admin-table-sort-asc: $fa-var-sort-down; $icon-admin-table-sort-desc: $fa-var-sort-up; + +.fa-square-question:before { + content: "\f2fd"; +} + +.fa-message-quote:before { + content: "\e1e4"; +} + +.fa-inbox-in:before { + content: "\f310"; +} + +.fa-user-unlock:before { + content: "\e058"; +} + +.fa-user-magnifying-glass:before { + content: "\e5c5"; +} + +.fa-floppy-disk-pen:before { + content: "\e182"; +} + +.fa-pen-line:before { + content: "\e212"; +} + +.fa-arrow-up-from-line:before { + content: "\f342"; +} + +.fa-arrow-up-from-bracket:before { + content: "\e09a"; +} diff --git a/resources/views/job/partials/offer.twig b/resources/views/job/partials/offer.twig index 78fe1f6ac..4b6b7d5af 100644 --- a/resources/views/job/partials/offer.twig +++ b/resources/views/job/partials/offer.twig @@ -101,11 +101,11 @@ {% for i in 1..3 %} {% if tag.pivot.priority >= i %} - {{ icon('jobOfferRequirementProgress') }} + {{ icon('jobOfferRequirementRanked') }} {% else %} - - {{ icon('jobOfferRequirementProgress') }} + + {{ icon('jobOfferRequirementRank') }} {% endif %} {% endfor %} diff --git a/survey/src/screen/steps/badge.ts b/survey/src/screen/steps/badge.ts index 53d9b6725..315c3b288 100644 --- a/survey/src/screen/steps/badge.ts +++ b/survey/src/screen/steps/badge.ts @@ -28,7 +28,7 @@ export default { Zmieniaj forum na lepsze!