From 97baa7f2130e023df0691b894535ad69e7caa42b Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Tue, 19 Aug 2025 16:21:05 +0300 Subject: [PATCH] update icons --- customize.dist/pages/index.js | 1 - www/common/common-icons.js | 3 ++- www/common/common-interface.js | 2 +- www/common/common-ui-elements.js | 10 +++++----- www/common/inner/share.js | 12 ++++++------ www/common/make-backup.js | 6 ++++-- www/recovery/main.js | 4 ++-- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js index 5373b63a8..a259ad7bc 100644 --- a/customize.dist/pages/index.js +++ b/customize.dist/pages/index.js @@ -59,7 +59,6 @@ define([ var isEAEnabled = checkEarlyAccess(x[0]); //if (i > 2) { s += '.cp-more.cp-hidden'; } var icon = AppConfig.applicationsIcon[x[0]]; - var font = icon.indexOf('cptools') === 0 ? 'cptools' : 'fa'; var href = '/'+ x[0] +'/'; var attr = isEnabled ? { href: href } : { onclick: function () { diff --git a/www/common/common-icons.js b/www/common/common-icons.js index db0821162..8dc492245 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -201,7 +201,8 @@ define([ "map-pin": "map-pin", "checked-box": "square-check", "unchecked-box": "square", - "table": "table" + "table": "table", + "survey": "graduation-cap" }; Icons.get = (name, attrs = {}) => { diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 07dd082a8..714db4561 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -1527,7 +1527,7 @@ define([ }; UI.makeSpinner = function ($container) { - var $ok = $('', {'class': 'fa fa-check', title: Messages.saved}).hide(); + var $ok = $('', { title: Messages.saved}, Icons.get('check')).hide(); var $spinner = Icons.get('loading').hide(); var state = false; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 93ed9e860..dc06afa2b 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -461,11 +461,11 @@ define([ h('br'), h('div.cp-teams-invite-block', [ h('span', Messages.team_inviteLinkSetPassword), - h('a.cp-teams-help.fa.fa-question-circle', { + h('a.cp-teams-help', { href: Pages.localizeDocsLink('https://docs.cryptpad.org/en/user_guide/security.html#passwords-for-documents-and-folders'), target: "_blank", 'data-tippy-placement': "right" - }) + }, Icons.get('circle-question')) ]), linkPassword = UI.passwordInput({ id: 'cp-teams-invite-password', @@ -2327,9 +2327,9 @@ define([ options.push({ tag: 'a', attributes: { - 'class': 'cp-toolbar-survey fa fa-graduation-cap' + 'class': 'cp-toolbar-survey' }, - content: h('span', Messages.survey), + content: h('span', [Icons.get('survey'), Messages.survey]), action: function () { Common.openUnsafeURL(surveyURL); Feedback.send('SURVEY_CLICKED'); @@ -4337,7 +4337,7 @@ define([ if (!readOnly) { buttons.push({ className: 'primary', - iconClass: '.fa.fa-camera', + iconClass: 'camera', name: Messages.snapshots_new, onClick: function () { var val = $input.val(); diff --git a/www/common/inner/share.js b/www/common/inner/share.js index 5b5a81a31..fc0f51bf8 100644 --- a/www/common/inner/share.js +++ b/www/common/inner/share.js @@ -94,7 +94,7 @@ define([ var shareButton = { className: 'primary cp-share-with-friends', name: Messages.share_withFriends, - iconClass: '.fa.fa-shhare-alt', + iconClass: 'share', onClick: function () { var href; nThen(function (waitFor) { @@ -444,7 +444,7 @@ define([ !opts.sharedFolder && { className: 'secondary cp-nobar', name: Messages.share_linkOpen, - iconClass: '.fa.fa-eye', + iconClass: 'preview', onClick: function () { opts.saveValue(); var v = opts.getLinkValue({ @@ -533,7 +533,7 @@ define([ { className: 'primary cp-nobar', name: Messages.download_dl, - iconClass: '.fa.fa-download', + iconClass: 'download', onClick: function () { qr.querySelector('canvas').toBlob(blob => { var name = Util.fixFileName((opts.title || 'document') + '-qr.png'); @@ -571,7 +571,7 @@ define([ { className: 'primary', name: Messages.share_linkCopy, - iconClass: '.fa.fa-link', + iconClass: 'link', onClick: function () { Feedback.send('SHARE_EMBED'); var v = opts.getEmbedValue(); @@ -977,7 +977,7 @@ define([ { className: 'primary', name: Messages.share_linkCopy, - iconClass: '.fa.fa-link', + iconClass: 'link', onClick: function () { var v = opts.getLinkValue(); Clipboard.copy(v, (err) => { @@ -1023,7 +1023,7 @@ define([ }, { className: 'primary', name: Messages.share_mediatagCopy, - iconClass: '.fa.fa-link', + iconClass: 'link', onClick: function () { var v = common.getMediatagFromHref(opts.fileData); Clipboard.copy(v, (err) => { diff --git a/www/common/make-backup.js b/www/common/make-backup.js index a49842c5f..9c45cd458 100644 --- a/www/common/make-backup.js +++ b/www/common/make-backup.js @@ -16,8 +16,10 @@ define([ '/components/nthen/index.js', '/components/saferphore/index.js', '/components/jszip/dist/jszip.min.js', + '/customize/fonts/lucide.js', + '/common/common-icons.js', ], function ($, FileCrypto, Hash, Util, UI, h, Feedback, UO, - Cache, Messages, nThen, Saferphore, JsZip) { + Cache, Messages, nThen, Saferphore, Lucide, Icons) { var saveAs = window.saveAs; var sanitize = function (str) { @@ -528,7 +530,7 @@ define([ $(progress).find('.fa-square-o').removeClass('fa-square-o') .addClass('fa-check-square-o'); $(progress).append(h('p', [ - h('span.fa.fa-square-o'), + Icons.get('checked-box'), h('span.text', Messages['settings_export_' + step] || step) ])); done[step] = state; // -1 if no bar, object otherwise diff --git a/www/recovery/main.js b/www/recovery/main.js index 1d91a225b..4e1c50bab 100644 --- a/www/recovery/main.js +++ b/www/recovery/main.js @@ -65,8 +65,8 @@ define([ $forgot.click(function () { $alt.toggle(); - if ($alt.is(':visible')) { $forgot.find('i').attr('class', 'fa fa-caret-down'); } - else { $forgot.find('i').attr('class', 'fa fa-caret-right'); } + if ($alt.is(':visible')) { $forgot.find('i').attr('data-lucide', 'chevron-down'); } + else { $forgot.find('i').attr('data-lucide', 'chevron-right'); } }); var proofStr;