From ed85eff1160c8811ea9213e9e648632350351a9c Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Wed, 20 Aug 2025 16:21:10 +0300 Subject: [PATCH 1/6] update `shared-folder` icon --- www/common/common-icons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-icons.js b/www/common/common-icons.js index 7aa68e3f6..82c3c103f 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -8,7 +8,7 @@ define([ "homepage": "house", "drive": "hard-drive", "drive-search": "search", - "drive-shared-folder": "folder-git-2", // XXX change icon + "drive-shared-folder": "folder-users", // XXX change icon "drive-upload-file": "file-up", "drive-upload-folder": "folder-up", "file": "file", From a1eb6be546720d53acaefc1bef87cf9c7b6c3417 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 21 Aug 2025 15:25:25 +0300 Subject: [PATCH 2/6] update upload and download icons --- customize.dist/src/less2/include/fileupload.less | 4 ++++ www/common/common-icons.js | 2 +- www/common/sframe-common-file.js | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less index f3aba69d1..cf51bf454 100644 --- a/customize.dist/src/less2/include/fileupload.less +++ b/customize.dist/src/less2/include/fileupload.less @@ -49,6 +49,10 @@ &:hover { color: lighten(@cp_upload-fg, 10%); } + svg { + margin: 0; + } + } } #cp-fileupload-table { diff --git a/www/common/common-icons.js b/www/common/common-icons.js index 82c3c103f..011ff5d3e 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -8,7 +8,7 @@ define([ "homepage": "house", "drive": "hard-drive", "drive-search": "search", - "drive-shared-folder": "folder-users", // XXX change icon + "drive-shared-folder": "folder-users", "drive-upload-file": "file-up", "drive-upload-folder": "folder-up", "file": "file", diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index b99526b88..2be1ca4fd 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -143,6 +143,7 @@ define([ var $row = $table.find('tr[id="'+id+'"]'); $row.find('.cp-fileupload-table-cancel').addClass('success').html('').append(Icons.get('minus')); + Lucide.createIcons(); var $pv = $row.find('.cp-fileupload-table-progress-value'); var $pb = $row.find('.cp-fileupload-table-progressbar'); var $link = $row.find('.cp-fileupload-table-link'); @@ -292,8 +293,8 @@ define([ }).append(h('span.cp-fileupload-table-name', obj.dl ? obj.name : obj.metadata.name)); var typeIcon; - if (obj.dl) { typeIcon = Icons.get('chevron-down', { title: Messages.download_dl }); } - else { typeIcon = Icons.get('chevron-up', { title: Messages.upload_up }); } + if (obj.dl) { typeIcon = Icons.get('download', { title: Messages.download_dl }); } + else { typeIcon = Icons.get('upload', { title: Messages.upload_up }); } // type (download / upload) $('', {'class': 'cp-fileupload-table-type'}).append(typeIcon).appendTo($tr); @@ -313,7 +314,7 @@ define([ if (diff && diff > 0) { $table.css('margin-right', diff+'px'); } - + Lucide.createIcons(); queue.next(); }; From b697c5c058334ced53e90b3121894ea1100d861d Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:06:45 +0300 Subject: [PATCH 3/6] update icons creation page --- .../src/less2/include/creation.less | 23 ++++++++++++++----- www/common/common-ui-elements.js | 1 + 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less index 11f5ace20..e2a643230 100644 --- a/customize.dist/src/less2/include/creation.less +++ b/customize.dist/src/less2/include/creation.less @@ -122,10 +122,13 @@ position: relative; a { position: absolute; - top: 7px; - margin-left: 30px; + margin-left: 1em; font-size: 16px; color: inherit; + + svg { + margin: 0; + } } a:focus-visible { border-radius: 50%; @@ -196,6 +199,9 @@ &:hover { text-decoration: none; } + svg { + margin: 0; + } } .cp-creation-slider { display: none; @@ -343,7 +349,6 @@ flex-wrap: nowrap; justify-content: space-between; .cp-creation-template-more { - font-size: 30px; margin: 0 5px; text-align: center; background-color: transparent; @@ -366,6 +371,11 @@ outline: @variables_focus_style; border-radius: @variables_radius; } + svg { + margin: 0; + height: 1.5rem; + width: 1.5rem; + } } } .cp-creation-template-container { @@ -399,7 +409,7 @@ &.cp-creation-template-selected, &:hover { background-color: @creation-bg-color-light; background-color: var(--creation-bg-color-light); - .fa, .cptools { + svg { color: @creation-color; color: var(--creation-color); } @@ -430,11 +440,12 @@ line-height: 25px; max-width: 100%; } - .fa, .cptools { + svg { color: @creation-bg-color; color: var(--creation-bg-color); cursor: pointer; - font-size: 30px; + height: 1.8rem; + width: 1.8rem; text-align: center; margin-right: 10px; } diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 0cdaaf165..4c2e84ff5 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -2961,6 +2961,7 @@ define([ icon: UI.getFileIcon({type: type}) }); var redraw = function (index) { + setTimeout( ()=> Lucide.createIcons()); if (index < 0) { i = 0; } else if (index > allData.length - 1) { return; } else { i = index; } From 7d95170f0aef4d582642d46d547e148486a45f43 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:19:36 +0300 Subject: [PATCH 4/6] update icon responsiveness --- customize.dist/src/less2/include/toolbar.less | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less index 05c76177b..f8bdccbab 100644 --- a/customize.dist/src/less2/include/toolbar.less +++ b/customize.dist/src/less2/include/toolbar.less @@ -557,8 +557,9 @@ //transform: scale(0.5); .cp-toolbar-link-logo { padding: 5px; - span { - font-size: 24px; + svg { + height: 1.5rem; + width: 1.5rem; } } } @@ -821,9 +822,6 @@ justify-content: center; cursor: pointer; order: 1; - .fa { - margin: 0; - } a.cp-toolbar-link-logo { cursor: pointer; display: inline-flex; @@ -833,28 +831,11 @@ color: @toolbar-bg-color; color: var(--toolbar-bg-color); border-radius: @variables_radius; - svg { height: 3rem; width: 3rem; margin: 0; } - span { - font-size: 45px; - } - - &:hover { - // Icons shown when hovering the toolbar icon (where logo used to be) - .cptools::before { - content: "\e920"; // shows drive icon in document toolbars - } - .fa::before { - content: "\f0a0"; // shows hdd-o for all FA icons (settings, etc) - } - .fa-hdd-o::before { - content: "\f015"; // shows home for drive - } - } // svg { // #outline, #squares { From 6d0ed78b04a8f91bf7ff8f23d1bf3f060bc78fc9 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:45:28 +0300 Subject: [PATCH 5/6] update collapse button icon --- www/common/toolbar.js | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/www/common/toolbar.js b/www/common/toolbar.js index 355058347..80d635a66 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -513,33 +513,25 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) { }; var createCollapse = function (toolbar) { - // XXX to be updated - var up = Icons.get('chevron-up', {title: Messages.toolbar_collapse}); - var down = Icons.get('chevron-down', {title: Messages.toolbar_expand}); + var icon = Icons.get('chevron-up', {title: Messages.toolbar_collapse}); var notif = h('span.cp-collapsed-notif'); var $button = $(h('button.cp-toolbar-collapse',[ - up, - down, + icon, notif ])); - var $up = $(up); - var $down = $(down); toolbar.$bottomR.prepend($button); - $down.hide(); $(notif).hide(); $button.click(function () { toolbar.$top.toggleClass('toolbar-hidden'); var hidden = toolbar.$top.hasClass('toolbar-hidden'); $button.toggleClass('cp-toolbar-button-active'); - if (hidden) { - $up.hide(); - $down.show(); - } else { - $up.show(); - $down.hide(); - $(notif).hide(); - } + const newIcon = hidden ? + Icons.get('chevron-down', {title: Messages.toolbar_expand}): + Icons.get('chevron-up', {title: Messages.toolbar_collapse}); + + $button.find('[data-lucide]').replaceWith(newIcon); + Lucide.createIcons(); }); }; From 70955ce638d03af8409177f7b77bb90bbd541318 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Fri, 22 Aug 2025 12:14:43 +0300 Subject: [PATCH 6/6] update calendar style --- www/calendar/app-calendar.less | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less index e66f39ace..5555ed8f5 100644 --- a/www/calendar/app-calendar.less +++ b/www/calendar/app-calendar.less @@ -38,12 +38,6 @@ .tui-full-calendar-confirm { - span, i { - padding: 0 0.5rem; - } - span { - padding-left: 0; - } width: unset; } @@ -171,7 +165,7 @@ color: @cryptpad_text_col; border-radius: @variables_radius_L; font-weight: normal; - .tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox):not(.fa-map-marker):not(.fa-align-justify):not(svg) { + .tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox):not(svg) { display: none; } .tui-full-calendar-icon { @@ -186,13 +180,11 @@ display: flex; align-items: center; } - .fa-align-justify { - margin-top: 3px; - } &.tui-full-calendar-popup-detail-item-separate { &>span { display: flex; width: 100%; + align-items: center; } .event-description { display: block; @@ -224,7 +216,8 @@ .tui-full-calendar-section-button-save { height: 40px; .btn-primary { // Update button - margin-right: 0px; + margin-right: 0; + display: flex; } } @@ -345,6 +338,8 @@ button { flex: 1; margin: 0; + display: inline-flex; + justify-content: center; } } .tui-full-calendar-popup-top-line { @@ -360,13 +355,13 @@ .cp-recurrence-label, .cp-notif-label { color: @cryptpad_text_col; margin-right: 1rem; - i { - margin-right: 0.5rem; - } + display: inline-flex; + align-items: center; } .cp-calendar-recurrence-container { margin-top: 1rem; + display: inline-flex; .cp-calendar-rec-translated-str { margin-top: 0.5rem; } @@ -382,6 +377,7 @@ } & > div { display: flex; + align-items: self-start; } .cp-calendar-notif-list-container { width: 100%; @@ -721,9 +717,6 @@ &:focus-visible { outline: @variables_focus_style; } - i { - margin-left: 5px; - } } } &:not(:last-child) { @@ -786,11 +779,9 @@ .cp-calendar-notif-list-container, .cp-calendar-notif-form { flex-direction: column; align-items: unset !important; + gap: 1rem; } .cp-calendar-newevent { - i { - margin: 0 !important; - } span { display: none; }