diff --git a/app/scripts/comp/extension/protocol-impl.js b/app/scripts/comp/extension/protocol-impl.js index 1f449659..707728b1 100644 --- a/app/scripts/comp/extension/protocol-impl.js +++ b/app/scripts/comp/extension/protocol-impl.js @@ -202,7 +202,7 @@ async function checkContentRequestPermissions(request) { try { await alertWithTimeout({ header: Locale.extensionConnectHeader, - icon: 'exchange-alt', + icon: 'right-left', buttons: [Alerts.buttons.allow, Alerts.buttons.deny], view: extensionConnectView, wide: true, @@ -370,6 +370,7 @@ const ProtocolHandlers = { }, 'change-public-keys'(request, connection) { + // eslint-disable-next-line prefer-const let { publicKey, version, clientID: clientId } = request; if (connectedClients.has(clientId)) { diff --git a/app/scripts/comp/ui/alerts.js b/app/scripts/comp/ui/alerts.js index 2443ad27..aec8eebd 100644 --- a/app/scripts/comp/ui/alerts.js +++ b/app/scripts/comp/ui/alerts.js @@ -71,7 +71,7 @@ const Alerts = { this.alert({ header: Locale.notImplemented, body: '', - icon: 'exclamation-triangle', + icon: 'triangle-exclamation', buttons: [this.buttons.ok], esc: '', click: '', @@ -96,7 +96,7 @@ const Alerts = { this.alert({ header: '', body: '', - icon: 'exclamation-circle', + icon: 'circle-exclamation', buttons: [this.buttons.ok], esc: '', click: '', diff --git a/app/scripts/const/icon-map.js b/app/scripts/const/icon-map.js index b8f35d26..ef57e545 100644 --- a/app/scripts/const/icon-map.js +++ b/app/scripts/const/icon-map.js @@ -1,12 +1,12 @@ const IconMap = [ 'key', 'globe', - 'exclamation-triangle', + 'triangle-exclamation', 'server', 'thumbtack', 'comments', 'puzzle-piece', - 'edit', + 'pen-to-square', 'plug', 'address-card', 'paperclip', @@ -19,47 +19,47 @@ const IconMap = [ 'bullseye', 'desktop', 'envelope', - 'cog', + 'gear', 'clipboard', 'paper-plane', 'newspaper', 'bolt', 'inbox', - 'save', - 'hdd', - 'dot-circle', + 'floppy-disk', + 'hard-drive', + 'circle-dot', 'user-lock', 'terminal', 'print', - 'project-diagram', + 'diagram-project', 'flag-checkered', 'wrench', 'laptop', - 'archive', + 'box-archive', 'credit-card', 'windows', 'clock', - 'search', + 'magnifying-glass', 'flask', 'gamepad', 'trash', - 'sticky-note', + 'note-sticky', 'ban', - 'question-circle', + 'circle-question', 'cube', 'folder-o', 'folder-open-o', 'database', - 'unlock-alt', + 'unlock-keyhole', 'lock', 'check', - 'pencil-alt', + 'pencil', 'image', 'book', - 'list-alt', + 'rectangle-list', 'user-secret', 'utensils', - 'home', + 'house', 'star', 'linux', 'map-pin', diff --git a/app/scripts/models/attachment-model.js b/app/scripts/models/attachment-model.js index 511a9cda..1744118d 100644 --- a/app/scripts/models/attachment-model.js +++ b/app/scripts/models/attachment-model.js @@ -48,7 +48,7 @@ function getIcon(ext) { case 'log': case 'rtf': case 'pem': - return 'file-alt'; + return 'file-lines'; case 'html': case 'htm': case 'js': @@ -89,7 +89,7 @@ function getIcon(ext) { case 'ace': case 'dmg': case 'jar': - return 'file-archive'; + return 'file-zipper'; case 'doc': case 'docx': return 'file-word'; diff --git a/app/scripts/models/menu/menu-model.js b/app/scripts/models/menu/menu-model.js index 53629047..da8fa007 100644 --- a/app/scripts/models/menu/menu-model.js +++ b/app/scripts/models/menu/menu-model.js @@ -17,7 +17,7 @@ class MenuModel extends Model { this.allItemsSection = new MenuSectionModel([ { locTitle: 'menuAllItems', - icon: 'th-large', + icon: 'table-cells-large', active: true, shortcut: Keys.DOM_VK_A, filterKey: '*' @@ -43,7 +43,7 @@ class MenuModel extends Model { this.trashSection = new MenuSectionModel([ { locTitle: 'menuTrash', - icon: 'trash-alt', + icon: 'trash-can', shortcut: Keys.DOM_VK_D, filterKey: 'trash', filterValue: true, @@ -69,7 +69,7 @@ class MenuModel extends Model { this.generalSection = new MenuSectionModel([ { locTitle: 'menuSetGeneral', - icon: 'cog', + icon: 'gear', page: 'general', section: 'top', active: true diff --git a/app/scripts/storage/impl/storage-file.js b/app/scripts/storage/impl/storage-file.js index 4c08da01..57c94896 100644 --- a/app/scripts/storage/impl/storage-file.js +++ b/app/scripts/storage/impl/storage-file.js @@ -5,7 +5,7 @@ const fileWatchers = {}; class StorageFile extends StorageBase { name = 'file'; - icon = 'hdd'; + icon = 'hard-drive'; enabled = !!Launcher; system = true; backup = true; diff --git a/app/scripts/storage/impl/storage-teams.js b/app/scripts/storage/impl/storage-teams.js index d30de541..605355a9 100644 --- a/app/scripts/storage/impl/storage-teams.js +++ b/app/scripts/storage/impl/storage-teams.js @@ -15,7 +15,7 @@ class StorageTeams extends StorageBase { name = 'msteams'; enabled = true; uipos = 50; - icon = 'user-friends'; + icon = 'user-group'; _graphUrl = 'https://graph.microsoft.com/v1.0'; _groupsUrl = `${this._graphUrl}/me/joinedTeams`; diff --git a/app/scripts/views/details/details-issues-view.js b/app/scripts/views/details/details-issues-view.js index c507f2ef..0eb33912 100644 --- a/app/scripts/views/details/details-issues-view.js +++ b/app/scripts/views/details/details-issues-view.js @@ -125,7 +125,7 @@ class DetailsIssuesView extends View { Alerts.alert({ header: Locale.detIssueCloseAlertHeader, body: Locale.detIssueCloseAlertBody, - icon: 'exclamation-triangle', + icon: 'triangle-exclamation', buttons: [ { result: 'entry', title: Locale.detIssueCloseAlertEntry, silent: true }, { result: 'settings', title: Locale.detIssueCloseAlertSettings, silent: true }, diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js index 741325aa..89f1b95c 100644 --- a/app/scripts/views/details/details-view.js +++ b/app/scripts/views/details/details-view.js @@ -240,7 +240,7 @@ class DetailsView extends View { if (fieldView.isHidden()) { moreOptions.push({ value: 'add:' + fieldView.model.name, - icon: 'pencil-alt', + icon: 'pencil', text: Locale.detMenuAddField.replace('{}', fieldView.model.title) }); } @@ -856,7 +856,7 @@ class DetailsView extends View { Alerts.yesno({ header: Locale.detDelToTrash, body: Locale.detDelToTrashBody, - icon: 'trash-alt', + icon: 'trash-can', success: doMove }); } else { @@ -878,7 +878,7 @@ class DetailsView extends View { header: Locale.detDelFromTrash, body: Locale.detDelFromTrashBody, hint: Locale.detDelFromTrashBodyHint, - icon: 'minus-circle', + icon: 'circle-minus', success: () => { this.model.deleteFromTrash(); Events.emit('refresh'); diff --git a/app/scripts/views/fields/field-view.js b/app/scripts/views/fields/field-view.js index 738516cd..c8e61f89 100644 --- a/app/scripts/views/fields/field-view.js +++ b/app/scripts/views/fields/field-view.js @@ -330,7 +330,7 @@ class FieldView extends View { if (this.value) { actions.push({ name: 'copy', icon: 'copy' }); } - actions.push({ name: 'edit', icon: 'pencil-alt' }); + actions.push({ name: 'edit', icon: 'pencil' }); if (this.value instanceof kdbxweb.ProtectedValue) { actions.push({ name: 'reveal', icon: 'eye' }); } diff --git a/app/scripts/views/list-search-view.js b/app/scripts/views/list-search-view.js index d9ba896c..808bec52 100644 --- a/app/scripts/views/list-search-view.js +++ b/app/scripts/views/list-search-view.js @@ -40,64 +40,64 @@ class ListSearchView extends View { this.sortOptions = [ { value: 'title', - icon: 'sort-alpha-down', + icon: 'arrow-down-a-z', loc: () => StringFormat.capFirst(Locale.title) + ' ' + this.addArrow(Locale.searchAZ) }, { value: '-title', - icon: 'sort-alpha-down-alt', + icon: 'arrow-down-z-a', loc: () => StringFormat.capFirst(Locale.title) + ' ' + this.addArrow(Locale.searchZA) }, { value: 'website', - icon: 'sort-alpha-down', + icon: 'arrow-down-a-z', loc: () => StringFormat.capFirst(Locale.website) + ' ' + this.addArrow(Locale.searchAZ) }, { value: '-website', - icon: 'sort-alpha-down-alt', + icon: 'arrow-down-z-a', loc: () => StringFormat.capFirst(Locale.website) + ' ' + this.addArrow(Locale.searchZA) }, { value: 'user', - icon: 'sort-alpha-down', + icon: 'arrow-down-a-z', loc: () => StringFormat.capFirst(Locale.user) + ' ' + this.addArrow(Locale.searchAZ) }, { value: '-user', - icon: 'sort-alpha-down-alt', + icon: 'arrow-down-z-a', loc: () => StringFormat.capFirst(Locale.user) + ' ' + this.addArrow(Locale.searchZA) }, { value: 'created', - icon: 'sort-numeric-down', + icon: 'arrow-down-1-9', loc: () => Locale.searchCreated + ' ' + this.addArrow(Locale.searchON) }, { value: '-created', - icon: 'sort-numeric-down-alt', + icon: 'arrow-down-9-1', loc: () => Locale.searchCreated + ' ' + this.addArrow(Locale.searchNO) }, { value: 'updated', - icon: 'sort-numeric-down', + icon: 'arrow-down-1-9', loc: () => Locale.searchUpdated + ' ' + this.addArrow(Locale.searchON) }, { value: '-updated', - icon: 'sort-numeric-down-alt', + icon: 'arrow-down-9-1', loc: () => Locale.searchUpdated + ' ' + this.addArrow(Locale.searchNO) }, { value: '-attachments', - icon: 'sort-amount-down', + icon: 'arrow-down-wide-short', loc: () => Locale.searchAttachments }, - { value: '-rank', icon: 'sort-amount-down', loc: () => Locale.searchRank } + { value: '-rank', icon: 'arrow-down-wide-short', loc: () => Locale.searchRank } ]; this.sortIcons = {}; this.sortOptions.forEach((opt) => { @@ -394,7 +394,7 @@ class ListSearchView extends View { options.sort(Comparators.stringComparator('text', true)); options.push({ value: 'tmpl', - icon: 'sticky-note-o', + icon: 'note-sticky-o', text: StringFormat.capFirst(Locale.template) }); return options; diff --git a/app/scripts/views/list-view.js b/app/scripts/views/list-view.js index ec9a990e..255425e1 100644 --- a/app/scripts/views/list-view.js +++ b/app/scripts/views/list-view.js @@ -283,7 +283,7 @@ class ListView extends View { createTemplate() { if (!this.model.settings.templateHelpShown) { Alerts.yesno({ - icon: 'sticky-note-o', + icon: 'note-sticky-o', header: Locale.listAddTemplateHeader, body: Locale.listAddTemplateBody1.replace('{}', '"+"') + @@ -397,7 +397,7 @@ class ListView extends View { const targetElRect = this.$el.find('.list__table-options')[0].getBoundingClientRect(); const options = this.tableColumns.map((col) => ({ value: col.val, - icon: col.enabled ? 'check-square-o' : 'square-o', + icon: col.enabled ? 'square-check' : 'square-o', text: StringFormat.capFirst(Locale[col.name]) })); view.render({ @@ -420,7 +420,7 @@ class ListView extends View { optionsDropdownSelect(e) { const col = this.tableColumns.find((c) => c.val === e.item); col.enabled = !col.enabled; - e.el.find('i:first').toggleClass('fa-check-square-o fa-square-o'); + e.el.find('i:first').toggleClass('fa-square-check fa-square-o'); this.render(); this.saveTableColumnsEnabled(); } diff --git a/app/scripts/views/menu/menu-item-view.js b/app/scripts/views/menu/menu-item-view.js index 9f2c3b29..0469d67c 100644 --- a/app/scripts/views/menu/menu-item-view.js +++ b/app/scripts/views/menu/menu-item-view.js @@ -183,7 +183,7 @@ class MenuItemView extends View { Alerts.yesno({ header: Locale.menuEmptyTrashAlert, body: Locale.menuEmptyTrashAlertBody, - icon: 'minus-circle', + icon: 'circle-minus', success() { Events.emit('empty-trash'); } diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index 580b5ceb..490a5891 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -165,7 +165,7 @@ class OpenView extends View { getLastOpenFiles() { return this.model.fileInfos.map((fileInfo) => { - let icon = 'file-alt'; + let icon = 'file-lines'; const storage = Storage[fileInfo.storage]; if (storage && storage.icon) { icon = storage.icon; @@ -194,7 +194,7 @@ class OpenView extends View { Alerts.alert({ header: Locale.openLocalFile, body: Locale.openLocalFileBody, - icon: 'file-alt', + icon: 'file-lines', buttons: [ { result: 'skip', title: Locale.openLocalFileDontShow, error: true }, { result: 'ok', title: Locale.alertOk } @@ -852,7 +852,7 @@ class OpenView extends View { Alerts.alert({ header: Locale.openSelectFile, body: Locale.openSelectFileBody, - icon: storage.icon || 'file-alt', + icon: storage.icon || 'file-lines', buttons: [{ result: '', title: Locale.alertCancel }], esc: '', click: '', diff --git a/app/scripts/views/settings/settings-browser-view.js b/app/scripts/views/settings/settings-browser-view.js index d747dcfb..2cccefe6 100644 --- a/app/scripts/views/settings/settings-browser-view.js +++ b/app/scripts/views/settings/settings-browser-view.js @@ -128,7 +128,7 @@ class SettingsBrowserView extends View { e.target.checked = false; Alerts.yesno({ - icon: 'exclamation-triangle', + icon: 'triangle-exclamation', header: Locale.setBrowserExtensionKPXCWarnHeader.replace('{}', 'KeePassXC'), body: Locale.setBrowserExtensionKPXCWarnBody1.replace(/{}/g, 'KeePassXC') + diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index a9bc4d6d..fe8c6a10 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -337,7 +337,7 @@ class SettingsFileView extends View { Alerts.alert({ header: '', body: '', - icon: storage.icon || 'file-alt', + icon: storage.icon || 'file-lines', buttons: [Alerts.buttons.ok, Alerts.buttons.cancel], esc: '', opaque: true, diff --git a/app/templates/app.hbs b/app/templates/app.hbs index 84d76a3a..76127761 100644 --- a/app/templates/app.hbs +++ b/app/templates/app.hbs @@ -1,5 +1,5 @@
- {{#if beta}}
{{res 'appBeta'}}
{{/if}} + {{#if beta}}
{{res 'appBeta'}}
{{/if}} {{#if customTitlebar}}
{{else}} diff --git a/app/templates/details/details-attachment.hbs b/app/templates/details/details-attachment.hbs index 0f311fd3..1bae099b 100644 --- a/app/templates/details/details-attachment.hbs +++ b/app/templates/details/details-attachment.hbs @@ -1,6 +1,6 @@
- {{res 'detHistoryReturn'}} + {{res 'detHistoryReturn'}}
diff --git a/app/templates/details/details-group.hbs b/app/templates/details/details-group.hbs index e1d2d8ea..e84e26f7 100644 --- a/app/templates/details/details-group.hbs +++ b/app/templates/details/details-group.hbs @@ -1,6 +1,6 @@

{{res 'detGroupRestore'}}

- +
diff --git a/app/templates/details/details-history.hbs b/app/templates/details/details-history.hbs index 5fa246ff..fb66c832 100644 --- a/app/templates/details/details-history.hbs +++ b/app/templates/details/details-history.hbs @@ -1,13 +1,13 @@
- {{res 'detHistoryReturn'}} + {{res 'detHistoryReturn'}}
{{res 'detHistoryClickPoint'}}
-
-
+
+
diff --git a/app/templates/details/details-issues.hbs b/app/templates/details/details-issues.hbs index e987df9c..5aa8d55f 100644 --- a/app/templates/details/details-issues.hbs +++ b/app/templates/details/details-issues.hbs @@ -1,7 +1,7 @@ {{#if passwordIssue}}
- +
@@ -20,7 +20,7 @@ {{/ifeq}}
- +
{{else}} diff --git a/app/templates/details/details.hbs b/app/templates/details/details.hbs index 98529b5b..56d18f45 100644 --- a/app/templates/details/details.hbs +++ b/app/templates/details/details.hbs @@ -47,9 +47,9 @@ {{#if showButtons}}
{{#if deleted~}} - + {{~else~}} - + {{~/if~}}
diff --git a/app/templates/footer.hbs b/app/templates/footer.hbs index 9240532e..129b9ecf 100644 --- a/app/templates/footer.hbs +++ b/app/templates/footer.hbs @@ -4,7 +4,7 @@ data-file-id="{{file.id}}" id="footer__db--{{file.id}}"> {{file.name}} {{#if file.syncing~}} - + {{~else if file.syncError~}} @@ -21,9 +21,9 @@ {{#if updateAvailable}} {{else}} - + {{/if}}
-
+
diff --git a/app/templates/grp.hbs b/app/templates/grp.hbs index 0582d80b..a23adee4 100644 --- a/app/templates/grp.hbs +++ b/app/templates/grp.hbs @@ -1,6 +1,6 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}
@@ -43,7 +43,7 @@
{{#unless readonly}}
- +
{{/unless}}
diff --git a/app/templates/icon-select.hbs b/app/templates/icon-select.hbs index 9ba4342e..ecc19ab0 100644 --- a/app/templates/icon-select.hbs +++ b/app/templates/icon-select.hbs @@ -9,12 +9,12 @@ {{#if canDownloadFavicon}} - + {{/if}} - +
{{#if hasCustomIcons}} diff --git a/app/templates/import-csv.hbs b/app/templates/import-csv.hbs index ee2ceef4..d35dcb01 100644 --- a/app/templates/import-csv.hbs +++ b/app/templates/import-csv.hbs @@ -1,7 +1,7 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}

{{res 'importCsvTitle'}}

diff --git a/app/templates/list-search.hbs b/app/templates/list-search.hbs index eba332af..70739665 100644 --- a/app/templates/list-search.hbs +++ b/app/templates/list-search.hbs @@ -6,18 +6,18 @@
- +
- +
- +
{{res 'searchSearchIn'}}:
diff --git a/app/templates/menu/menu-item.hbs b/app/templates/menu/menu-item.hbs index f7215567..239900fa 100644 --- a/app/templates/menu/menu-item.hbs +++ b/app/templates/menu/menu-item.hbs @@ -4,7 +4,7 @@ {{~#if options.length}} menu__item--with-options {{/if~}} {{~#if cls}} {{cls}}{{/if~}} "> - {{#if collapsible}}{{/if}} + {{#if collapsible}}{{/if}}
{{#if drag}}
{{/if}} {{#if customIcon~}} @@ -22,8 +22,8 @@ {{/each}}
{{/if}} - {{#if editable}}{{/if}} - {{#ifeq filterKey 'trash'}}{{/if}} + {{#ifeq filterKey 'trash'}}{{/ifeq}}
diff --git a/app/templates/open.hbs b/app/templates/open.hbs index 94d342cd..79ca03c6 100644 --- a/app/templates/open.hbs +++ b/app/templates/open.hbs @@ -3,7 +3,7 @@
{{#if unlockMessageRes}}{{res unlockMessageRes}}{{/if}}
- +
@@ -27,14 +27,14 @@ {{#if canOpenDemo}} {{#ifeq demoOpened false}}
- +
{{res 'openDemo'}}
{{/ifeq}} {{/if}} {{#if showMore}}
- +
{{res 'openMore'}}
{{/if}} @@ -56,7 +56,7 @@ {{#if canOpenDemo}} {{#if demoOpened}}
- +
{{res 'openDemo'}}
{{/if}} @@ -69,7 +69,7 @@ {{/if}} {{#if canOpenSettings}}
- +
{{res 'settings'}}
{{/if}} @@ -81,13 +81,13 @@
- +
- +
@@ -109,7 +109,7 @@ id="open__last-item--{{file.id}}"> {{#if file.icon}}{{/if}} {{file.name}} - {{#if ../canRemoveLatest}}{{/if}} + {{#if ../canRemoveLatest}}{{/if}}
{{/each}}
diff --git a/app/templates/select/select-entry-item.hbs b/app/templates/select/select-entry-item.hbs index 26b3ea5c..4a486b86 100644 --- a/app/templates/select/select-entry-item.hbs +++ b/app/templates/select/select-entry-item.hbs @@ -12,7 +12,7 @@ {{url}} {{#if itemOptions}} - + {{/if}} diff --git a/app/templates/select/select-entry.hbs b/app/templates/select/select-entry.hbs index 8d282ab9..b225e1d0 100644 --- a/app/templates/select/select-entry.hbs +++ b/app/templates/select/select-entry.hbs @@ -28,7 +28,7 @@ data-filter="{{filter.id}}" data-active="{{filter.active}}" > - +
{{filter.type}}{{#if filter.text}}: {{/if}}{{filter.text}}
diff --git a/app/templates/settings/settings-browser.hbs b/app/templates/settings/settings-browser.hbs index 6984aad1..5a382f0c 100644 --- a/app/templates/settings/settings-browser.hbs +++ b/app/templates/settings/settings-browser.hbs @@ -29,7 +29,7 @@ class="settings__browser-extension-link icon-link" title="{{res 'setBrowserExtensionHelp'}}" > - + {{else}} {{#if setting.supported}} @@ -41,7 +41,7 @@ data-extension="{{setting.alias}}" /> {{else}} - + {{/if}} {{#if setting.enabled}} {{#if setting.helpUrl}} @@ -49,7 +49,7 @@ class="settings__browser-extension-link icon-link" title="{{res 'setBrowserExtensionHelp'}}" > - + {{/if}} {{#if setting.installUrl}} diff --git a/app/templates/settings/settings-file.hbs b/app/templates/settings/settings-file.hbs index 750f5297..891feba0 100644 --- a/app/templates/settings/settings-file.hbs +++ b/app/templates/settings/settings-file.hbs @@ -26,7 +26,7 @@

{{res 'setFileSaveTo'}}

{{#ifneq storage 'file'}}
- {{Res 'file'}} + {{Res 'file'}}
{{/ifneq}} {{#each storageProviders as |prv|}} @@ -58,7 +58,7 @@

{{res 'settings'}}

@@ -70,7 +70,7 @@
diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs index b2895a45..4fc4df14 100644 --- a/app/templates/settings/settings-general.hbs +++ b/app/templates/settings/settings-general.hbs @@ -36,6 +36,7 @@
{{/if}} +

{{res 'setGenAppearance'}}

{{#if locales}}
@@ -105,6 +106,7 @@
+

{{res 'setGenFunction'}}

{{#if canAutoSaveOnClose}}
@@ -217,6 +219,7 @@ {{/if}} {{/if}} +

{{res 'setGenAudit'}}

+

{{res 'setGenLock'}}

@@ -312,6 +316,7 @@
{{/if}} +

{{res 'setGenStorage'}}

{{res 'setGenStorageLogout'}}{{/if}} {{/each}} +

{{res 'advanced'}}

{{res 'setGenShowAdvanced'}}
diff --git a/app/templates/settings/settings-plugins.hbs b/app/templates/settings/settings-plugins.hbs index 5bd8cefe..5284a0b5 100644 --- a/app/templates/settings/settings-plugins.hbs +++ b/app/templates/settings/settings-plugins.hbs @@ -12,7 +12,7 @@
    {{#if plugin.manifest.resources.js}}
  • {{res 'setPlJs'}}
    • {{/if}} - {{#if plugin.manifest.resources.css}}
  • {{res 'setPlCss'}}
    • {{/if}} + {{#if plugin.manifest.resources.css}}
  • {{res 'setPlCss'}}
    • {{/if}} {{#if plugin.manifest.resources.loc}}
  •   {{res 'setPlLoc'}}: {{plugin.manifest.locale.title}} {{#if ../hasUnicodeFlags}}{{#if plugin.manifest.locale}}{{#if plugin.manifest.locale.flag}} {{plugin.manifest.locale.flag}}{{/if}}{{/if}}{{/if}}
    • {{/if}} @@ -123,7 +123,7 @@
    {{plugin.manifest.description}}
      {{#if plugin.manifest.resources.js}}
    • {{res 'setPlJs'}}
      • {{/if}} - {{#if plugin.manifest.resources.css}}
    • {{res 'setPlCss'}}
      • {{/if}} + {{#if plugin.manifest.resources.css}}
    • {{res 'setPlCss'}}
      • {{/if}} {{#if plugin.manifest.resources.loc}}
    • {{res 'setPlLoc'}}: {{plugin.manifest.locale.title}}
      • {{/if}}
    diff --git a/app/templates/settings/settings.hbs b/app/templates/settings/settings.hbs index 335eefaf..cb790151 100644 --- a/app/templates/settings/settings.hbs +++ b/app/templates/settings/settings.hbs @@ -1,6 +1,6 @@
    - {{res 'retToApp'}} + {{res 'retToApp'}}
    diff --git a/app/templates/storage-file-list.hbs b/app/templates/storage-file-list.hbs index cb3c57a6..b548d0a0 100644 --- a/app/templates/storage-file-list.hbs +++ b/app/templates/storage-file-list.hbs @@ -15,7 +15,7 @@ {{#each files as |file|}} {{#unless file.dir}}
    - + {{file.name}}
    {{/unless}} diff --git a/app/templates/tag.hbs b/app/templates/tag.hbs index ab86d6ba..abb8377a 100644 --- a/app/templates/tag.hbs +++ b/app/templates/tag.hbs @@ -1,6 +1,6 @@
    - {{res 'retToApp'}} + {{res 'retToApp'}}

    {{res 'tagTitle'}}

    @@ -10,6 +10,6 @@
    - +
    diff --git a/build/loaders/fontawesome-loader.js b/build/loaders/fontawesome-loader.js index 4eedcfa6..a685487d 100644 --- a/build/loaders/fontawesome-loader.js +++ b/build/loaders/fontawesome-loader.js @@ -19,6 +19,7 @@ for (const svgDir of svgDirs) { .forEach((icon) => { const svgIconPath = path.join(svgDir, icon); const iconName = icon.substr(0, icon.length - 4) + suffix; + allIcons[iconName] = svgIconPath; }); } @@ -36,13 +37,16 @@ module.exports = function makeFontAwesomeWoff2() { if (err) { return callback(err); } + process.stdout.write('Building fontawesome.woff2... '); const startTime = Date.now(); try { const { fontData, iconsCount } = await buildFont(this, scssSource); const kb = (fontData.byteLength / 1024).toFixed(2); const time = Date.now() - startTime; + process.stdout.write(`ok: ${time}ms, ${iconsCount} icons, ${kb} KiB\n`); + const fontCss = fontData.toString('base64'); callback(null, `module.exports = "data:font/woff2;base64,${fontCss}"`); } catch (ex) { @@ -52,23 +56,62 @@ module.exports = function makeFontAwesomeWoff2() { }); }; +/* + helper function for testing charCode to unicode conversion. + + utilized in app\styles\base\_icon-font.scss to automatically assign unicode to each + font-awesome character in buildFont() + + @usage: toUnicode(charCode) + + charcode 61597 + Unicode: \uF09D +*/ + +// eslint-disable-next-line no-unused-vars +function toUnicode(charCode) { + return String.fromCharCode(charCode) + .split('') + .map((code, index, array) => { + const unicode = code.charCodeAt(0).toString(16).toUpperCase(); + if (unicode.length > 2) { + return '\\u' + unicode; + } + return code; + }) + .join(''); +} + +/* + converts charCode into symbol +*/ + +// eslint-disable-next-line no-unused-vars +function toSymbol(charCode) { + return String.fromCharCode(parseInt(charCode, 16)); +} + function buildFont(loader, scssSource) { const includedIcons = {}; - const includedIconList = [...scssSource.matchAll(/\n\$fa-var-([\w-]+):/g)].map( - ([, name]) => name - ); + const includedIconList = [...scssSource.matchAll(/\n\$fa-var-([\w-]+):/g)].map(([, name]) => { + // console.log(`name: ${name}`); + return name; + }); + for (const iconName of includedIconList) { if (includedIcons[iconName]) { throw new Error(`Duplicate icon: $fa-var-${iconName}`); } + if (!allIcons[iconName]) { throw new Error(`Icon not found: "${iconName}"`); } + includedIcons[iconName] = true; } const fontStream = new SVGIcons2SVGFontStream({ - fontName: 'Font Awesome 5 Free', + fontName: 'Font Awesome 6 Free', round: 10e12, log() {} }); @@ -85,7 +128,9 @@ function buildFont(loader, scssSource) { const glyph = fs.createReadStream(svgIconPath); glyph.metadata = { name: iconName, unicode: [String.fromCharCode(charCode)] }; - + // console.log(JSON.stringify(glyph, null, 4)); + // console.log(toUnicode(charCode)); + // console.log(toSymbol(charCode)); fontStream.write(glyph); } fontStream.end(); @@ -97,6 +142,8 @@ function buildFont(loader, scssSource) { data = Buffer.from(svg2ttf(data.toString('utf8')).buffer); data = Buffer.from(await wawoff2.compress(data)); + // debug to print all icons + // console.log(includedIconList); resolve({ fontData: data, iconsCount: includedIconList.length }); } catch (ex) { reject(ex);