github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 13:37:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5134 from mfilser/font_awesome_6.4.2-adding_missing_icons

Browse source 
Font awesome 6.4.2 adding missing icons
This commit is contained in:
Lauri Ojansivu 2023-09-16 15:52:25 +03:00 • committed by GitHub
commit d0a04522d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/components/boards/boardHeader.jade
View file

@ -13,13 +13,11 @@ template(name="boardHeaderBar")
if currentUser
with currentBoard
a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
i.fa.fa-pen-to-square
i.fa.fa-pencil-square-o
a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
//- i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
i.fa(class="fa-star fa{{#unless isStarred}}-regular{{else}}-solid{{/unless}}")
//- fa fa-star fa-regular
i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
if showStarCounter
span
= currentBoard.stars
@ -58,7 +56,7 @@ template(name="boardHeaderBar")
if currentUser
with currentBoard
a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
i.fa.fa-pen-to-square
i.fa.fa-pencil-square-o
a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
@ -126,7 +124,7 @@ template(name="boardHeaderBar")
if $eq boardView 'board-view-swimlanes'
i.fa.fa-th-large
if $eq boardView 'board-view-lists'
i.fa.fa-brands.fa-trello
i.fa.fa-trello
if $eq boardView 'board-view-cal'
i.fa.fa-calendar
span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-swimlanes'}}{{/if}}
@ -135,7 +133,7 @@ template(name="boardHeaderBar")
a.board-header-btn.js-multiselection-activate(
title="{{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}"
class="{{#if MultiSelection.isActive}}emphasis{{/if}}")
i.fa.fa-regular.fa-square-check
i.fa.fa-check-square-o
span {{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}
if MultiSelection.isActive
a.board-header-btn-close.js-multiselection-reset(title="{{_ 'filter-clear'}}")
@ -207,14 +205,14 @@ template(name="boardChangeViewPopup")
li
with "board-view-lists"
a.js-open-lists-view
i.fa.fa-brands.fa-trello.colorful
i.fa.fa-trello.colorful
| {{_ 'board-view-lists'}}
if $eq Utils.boardView "board-view-lists"
i.fa.fa-check
li
with "board-view-cal"
a.js-open-cal-view
i.fa.fa-calendar-days.colorful
i.fa.fa-calendar.colorful
| {{_ 'board-view-cal'}}
if $eq Utils.boardView "board-view-cal"
i.fa.fa-check

18
client/components/boards/boardsList.css
View file

@ -22,7 +22,8 @@
transform: rotate(4deg);
display: block !important;
}
.board-list li.starred .fa-star {
.board-list li.starred .fa-star,
.board-list li.starred .fa-star-o {
opacity: 1;
}
.board-list .board-list-item {
@ -72,7 +73,8 @@
.board-list .js-add-board :hover {
background-color: #939393;
}
.board-list .fa-star {
.board-list .fa-star,
.board-list .fa-star-o {
bottom: 0;
font-size: 14px;
height: 18px;
@ -131,24 +133,28 @@
}
.board-list li:hover a:hover .fa-star,
.board-list li:hover a:hover .fa-clone,
.board-list li:hover a:hover .fa-archive {
.board-list li:hover a:hover .fa-archive,
.board-list li:hover a:hover .fa-star-o {
color: #fff;
}
.board-list li:hover a .fa-star,
.board-list li:hover a .fa-clone,
.board-list li:hover a .fa-archive {
.board-list li:hover a .fa-archive,
.board-list li:hover a .fa-star-o {
color: #fff;
opacity: 0.75;
}
.board-list li:hover a .fa-star:hover,
.board-list li:hover a .fa-clone:hover,
.board-list li:hover a .fa-archive:hover {
.board-list li:hover a .fa-archive:hover,
.board-list li:hover a .fa-star-o:hover {
font-size: 18px;
opacity: 1;
}
.board-list li:hover a .fa-star.is-star-active,
.board-list li:hover a .fa-clone.is-star-active,
.board-list li:hover a .fa-archive.is-star-active {
.board-list li:hover a .fa-archive.is-star-active,
.board-list li:hover a .fa-star-o.is-star-active {
opacity: 1;
}
.board-backgrounds-list .board-background-select {

6
client/components/cards/attachments.jade
View file

@ -91,7 +91,7 @@ template(name="attachmentGallery")
unless currentUser.isCommentOnly
unless currentUser.isWorker
a.js-rename
i.fa.fa-pen-to-square.icon(title="{{_ 'rename'}}")
i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
a.js-confirm-delete
i.fa.fa-trash.icon(title="{{_ 'delete'}}")
a.fa.fa-navicon.icon.js-open-attachment-menu(data-attachment-link="{{link}}" title="{{_ 'attachmentActionsPopup-title'}}")
@ -103,7 +103,7 @@ template(name="attachmentActionsPopup")
if isImage
a(class="{{#if isCover}}js-remove-cover{{else}}js-add-cover{{/if}}")
i.fa.fa-book
i.fa.fa-image
i.fa.fa-picture-o
if isCover
| {{_ 'remove-cover'}}
else
@ -111,7 +111,7 @@ template(name="attachmentActionsPopup")
if currentUser.isBoardAdmin
if isImage
a(class="{{#if isBackgroundImage}}js-remove-background-image{{else}}js-add-background-image{{/if}}")
i.fa.fa-image
i.fa.fa-picture-o
if isBackgroundImage
| {{_ 'remove-background-image'}}
else

2
client/components/cards/cardDetails.jade
View file

@ -659,7 +659,7 @@ template(name="cardDetailsActionsPopup")
//li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
li
a.js-spent-time
i.fa.fa-clock
i.fa.fa-clock-o
| {{_ 'editCardSpentTimePopup-title'}}
li
a.js-set-card-color

2
client/components/cards/minicard.jade
View file

@ -137,7 +137,7 @@ template(name="minicard")
unless currentUser.isNoComments
if comments.length
.badge(title="{{_ 'card-comments-title' comments.length }}")
span.badge-icon.fa.fa-comment-o.badge-comment
span.badge-icon.fa.fa-comment-o.badge-comment.badge-text
= ' '
= comments.length
//span.badge-comment.badge-text

4
client/components/main/myCards.jade
View file

@ -10,7 +10,7 @@ template(name="myCardsHeaderBar")
a.board-header-btn.js-my-cards-view-change(title="{{_ 'myCardsViewChange-title'}}")
i.fa.fa-caret-down
if $eq myCardsView 'boards'
i.fa-brands.fa-trello
i.fa.fa-trello
| {{_ 'myCardsViewChange-choice-boards'}}
if $eq myCardsView 'table'
i.fa.fa-table
@ -101,7 +101,7 @@ template(name="myCardsViewChangePopup")
li
with "myCardsViewChange-choice-boards"
a.js-my-cards-view-boards
i.fa-brands.fa-trello.colorful
i.fa.fa-trello.colorful
| {{_ 'myCardsViewChange-choice-boards'}}
if $eq Utils.myCardsView "boards"
i.fa.fa-check

6
client/components/notifications/notificationIcon.jade
View file

@ -21,15 +21,15 @@ template(name='notificationIcon')
else if($in activityType 'checkedItem' 'uncheckedItem' 'addChecklistItem' 'removedChecklistItem')
i.fa.fa-check-square.activity-type(title="checklist item")
else if($in activityType 'addComment')
i.fa.fa-comment.activity-type(title="comment")
i.fa.fa-comment-o.activity-type(title="comment")
else if($in activityType 'createCustomField' 'setCustomField' 'unsetCustomField')
i.fa.fa-code.activity-type(title="custom field")
else if($in activityType 'addedLabel' 'removedLabel')
i.fa.fa-tag.activity-type(title="label")
else if($in activityType 'a-startAt' 'a-receivedAt')
i.fa.fa-clock.activity-type(title="date")
i.fa.fa-clock-o.activity-type(title="date")
else if($in activityType 'a-dueAt' 'a-endAt')
i.fa.fa-clock.activity-type(title="date")
i.fa.fa-clock-o.activity-type(title="date")
else if($in activityType 'createList' 'removeList' 'archivedList')
+listNotificationIcon

8
client/components/sidebar/sidebar.jade
View file

@ -316,7 +316,7 @@ template(name="boardMinicardSettingsPopup")
.materialCheckBox(class="{{#if allowsCoverAttachmentOnMinicard}}is-checked{{/if}}")
span
i.fa.fa-book
i.fa.fa-image
i.fa.fa-picture-o
| {{_ 'cover-attachment-on-minicard'}}
div.check-div
a.flex.js-field-has-badge-attachment-on-minicard(class="{{#if allowsBadgeAttachmentOnMinicard}}is-checked{{/if}}")
@ -447,7 +447,7 @@ template(name="boardMenuPopup")
| {{_ 'board-change-color'}}
li
a.js-change-background-image
i.fa.fa-image
i.fa.fa-picture-o
| {{_ 'board-change-background-image'}}
//Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
//if currentUser.isBoardAdmin
@ -471,11 +471,11 @@ template(name="boardMenuPopup")
| {{_ 'outgoing-webhooks'}}
li
a.js-card-settings
i.fa.fa-address-card
i.fa.fa-id-card-o
| {{_ 'card-settings'}}
li
a.js-minicard-settings
i.fa.fa-id-card
i.fa.fa-id-card-o
| {{_ 'minicard-settings'}}
li
a.js-subtask-settings

2
client/components/sidebar/sidebarFilters.jade
View file

@ -5,7 +5,7 @@
template(name="filterSidebar")
h3
i.fa.fa-brands.fa-trello
i.fa.fa-trello
| {{_ 'list-filter-label'}}
ul.sidebar-list
form.js-list-filter

4
client/components/users/userHeader.jade
View file

@ -27,7 +27,7 @@ template(name="memberMenuPopup")
| {{_ 'globalSearch-title'}}
li
a(href="{{pathFor 'home'}}")
span.fa.fa-house
span.fa.fa-home
| {{_ 'all-boards'}}
li
a(href="{{pathFor 'public'}}")
@ -65,7 +65,7 @@ template(name="memberMenuPopup")
| {{_ 'change-settings'}}
li
a.js-change-avatar
i.fa.fa-image-portrait
i.fa.fa-picture-o
| {{_ 'edit-avatar'}}
unless isSandstorm
if isNotOAuth2AuthenticationMethod

6
packages/wekan-fontawesome/package.js
View file

@ -22,10 +22,14 @@ Package.onUse(function(api) {
], 'client');
api.addFiles([
'fontawesome-free/css/fontawesome.css',
'fontawesome-free/css/all.css',
'fontawesome-free/css/brands.css',
'fontawesome-free/css/fontawesome.css',
'fontawesome-free/css/regular.css',
'fontawesome-free/css/solid.css',
'fontawesome-free/css/svg-with-js.css',
'fontawesome-free/css/v4-font-face.css',
'fontawesome-free/css/v4-shims.css',
'fontawesome-free/css/v5-font-face.css',
], 'client');
});