From f1e4ae2761dfa71c9f4605446cf733820bdea38f Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 13:00:36 +0300 Subject: [PATCH 1/9] remove icon margin --- customize.dist/src/less2/include/toolbar.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less index 86c07c04e..92fd27a70 100644 --- a/customize.dist/src/less2/include/toolbar.less +++ b/customize.dist/src/less2/include/toolbar.less @@ -84,6 +84,9 @@ outline: @variables_focus_style; } } + svg { + margin: 0; + } button:nth-of-type(1) { margin-left: 0.2rem; } @@ -96,7 +99,7 @@ .toolbar_button { height: @toolbar_line-height; box-sizing: border-box; - padding: 3px 7px; + padding: 5px 7px; margin: 0; transition: all 0.15s; .tools_unselectable(); From 7679c75d2dffc154f3778824a7c4cad5c9dbe4c2 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 13:10:18 +0300 Subject: [PATCH 2/9] center template container --- customize.dist/src/less2/include/creation.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less index e2a643230..2630cb896 100644 --- a/customize.dist/src/less2/include/creation.less +++ b/customize.dist/src/less2/include/creation.less @@ -347,7 +347,7 @@ width: 100%; //flex: 1 0 auto; flex-wrap: nowrap; - justify-content: space-between; + justify-content: center; .cp-creation-template-more { margin: 0 5px; text-align: center; From 18e53b7c9d0fa0184e5979523cf02f3c6a8d3c13 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 13:48:23 +0300 Subject: [PATCH 3/9] render icons on form individual answers --- www/form/inner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/form/inner.js b/www/form/inner.js index 866ce31bb..5942f4c13 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -3101,6 +3101,7 @@ define([ }); $results.empty().append(elements); if (header) { $results.prepend(header); } + Lucide.createIcons(); }; show(answers); From 6072049f0b16594ffdf01db003c79a916a348357 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:33:42 +0300 Subject: [PATCH 4/9] render notification icons --- customize.dist/src/less2/include/notifications.less | 7 +++---- www/common/sframe-common-mailbox.js | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less index 64af35621..64ed2ade8 100644 --- a/customize.dist/src/less2/include/notifications.less +++ b/customize.dist/src/less2/include/notifications.less @@ -33,9 +33,7 @@ margin: 0; } .cp-broadcast { - display: flex; - align-items: center; - margin: 0 0.5rem; + margin: 0.5rem; width: 2rem; height: 2rem; color: @cp_dropdown-fg; @@ -59,8 +57,9 @@ } } .cp-notification-content { + display: flex; flex: 1; - align-items: stretch; + align-items: center; min-width: 0; p { word-break: break-word; diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js index c6c5263e7..6cadffa0f 100644 --- a/www/common/sframe-common-mailbox.js +++ b/www/common/sframe-common-mailbox.js @@ -11,8 +11,9 @@ define([ '/common/notifications.js', '/common/hyperscript.js', '/customize/messages.js', - '/common/common-icons.js' -], function ($, Util, Hash, UI, UIElements, Notifications, h, Messages, Icons) { + '/common/common-icons.js', + '/customize/fonts/lucide.js', +], function ($, Util, Hash, UI, UIElements, Notifications, h, Messages, Icons, Lucide) { var Mailbox = {}; Mailbox.create = function (Common) { @@ -187,6 +188,7 @@ define([ if (isNotification(data.type)) { Notifications.add(Common, data); el = createElement(data); + setTimeout(() => Lucide.createIcons()); } f(data, el); } catch (e) { From ac4a57fe094d7a36552bb2b318aec34ece31e79b Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:42:05 +0300 Subject: [PATCH 5/9] update icon color --- www/slide/inner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/slide/inner.js b/www/slide/inner.js index ac9d98620..5f3ae94ae 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -354,13 +354,13 @@ define([ textColor = text; $modal.css('color', text); $modal.css('border-color', text); - $('#' + SLIDE_COLOR_ID).find('i').css('color', text); + $('#' + SLIDE_COLOR_ID).find('svg').css('color', text); slideOptions.textColor = text; } if (back) { backColor = back; $modal.find('.cp-app-slide-frame').css('background-color', back); - $('#' + SLIDE_BACKCOLOR_ID).find('i').css('color', back); + $('#' + SLIDE_BACKCOLOR_ID).find('svg').css('color', back).css('fill', back); slideOptions.bgColor = back; } }; From 1c3a0cbbed5f2f8664a002d2e3c40f1578a3da3f Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:47:00 +0300 Subject: [PATCH 6/9] update badge icon color --- customize.dist/src/less2/include/badges.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/customize.dist/src/less2/include/badges.less b/customize.dist/src/less2/include/badges.less index cfbc29fb0..8fbda637b 100644 --- a/customize.dist/src/less2/include/badges.less +++ b/customize.dist/src/less2/include/badges.less @@ -46,6 +46,9 @@ svg { margin: 0; } + .lucide-star { + fill: currentColor; + } } } From 45f628f233407d62fec6d27ea2d841ee946319c6 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:14:47 +0300 Subject: [PATCH 7/9] update installation page change translation key --- customize.dist/messages.js | 4 +++ customize.dist/pages/install.js | 25 ++++++++++++++++--- .../src/less2/pages/page-install.less | 9 +++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/customize.dist/messages.js b/customize.dist/messages.js index 189802179..15741f89b 100755 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -141,6 +141,10 @@ define(req, function(AppConfig, Default, Language) { Messages.register_computer_note2 = 'remember to log out'; Messages.register_computer_note3 = ' when you are done. Only closing the browser window leaves your account exposed.'; Messages.register_import_note1 = 'To keep the documents you created and/or stored without being logged in, tick "Import documents from your guest session".'; + Messages.install_notes_admin = "Create your first administrator account on this page. Administrators manage instance settings including storage quotas, and have access to moderation tools."; + Messages.install_notes_password_note1 = "Your password is the secret key that encrypts all of your documents and administrator privileges on this instance. "; + Messages.install_notes_password_note2 = "If you lose it there is no way we can recover your data."; + return Messages; }); diff --git a/customize.dist/pages/install.js b/customize.dist/pages/install.js index 018d221b9..2b20e76ab 100644 --- a/customize.dist/pages/install.js +++ b/customize.dist/pages/install.js @@ -8,8 +8,9 @@ define([ '/common/hyperscript.js', '/common/common-interface.js', '/customize/messages.js', - '/customize/pages.js' -], function (Config, $, h, UI, Msg, Pages) { + '/customize/pages.js', + '/common/common-icons.js', +], function (Config, $, h, UI, Msg, Pages, Icons) { Config.adminKeys = []; return function () { // Redirect to drive if this instance already has admins @@ -36,7 +37,25 @@ define([ h('div.row.cp-register-det', [ h('div#data.hidden.col-md-6', [ h('h2', Msg.register_notes_title), - Pages.setHTML(h('div.cp-register-notes'), Msg.install_notes) + h('div.cp-register-notes', [ + h('ul.cp-notes-list', [ + h('li', [ + Icons.get('alert'), + Msg.install_notes_admin + ]), + h('li', [ + Icons.get('alert'), + Msg.install_notes_password_note1, + h('span.red', Msg.install_notes_password_note2) + ]), + h('li', [ + Icons.get('alert'), + Msg.register_computer_note1, + h('span.red', Msg.register_computer_note2), + Msg.register_computer_note3 + ]) + ]) + ]) ]), h('div.cp-reg-form.col-md-6', [ h('div#userForm.form-group.hidden', [ diff --git a/customize.dist/src/less2/pages/page-install.less b/customize.dist/src/less2/pages/page-install.less index b273677a8..5cd31a7ca 100644 --- a/customize.dist/src/less2/pages/page-install.less +++ b/customize.dist/src/less2/pages/page-install.less @@ -66,6 +66,9 @@ padding-right: 10px; } } + h2 { + padding-left: 30px; + } h3 { font-weight: 700; margin-bottom: 1em; @@ -112,12 +115,6 @@ position: relative; li { margin-bottom: 10px; - &::before { - position: absolute; - left: 0; - font-family: "FontAwesome"; - content: "\f071"; - } .red { background-color: @cp_static-danger; } From 0cec179bd958ed2463e6db949ab59cecb0c24fcd Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:39:59 +0300 Subject: [PATCH 8/9] update onboarding icons style --- customize.dist/src/less2/include/admin.less | 4 ++-- www/common/common-icons.js | 2 +- www/install/onboardscreen.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/admin.less b/customize.dist/src/less2/include/admin.less index 91012efe1..fad584b82 100644 --- a/customize.dist/src/less2/include/admin.less +++ b/customize.dist/src/less2/include/admin.less @@ -58,8 +58,8 @@ cursor: pointer; } .cp-icon { - height: 2.8rem; - width: 2.8rem; + min-height: 2.8rem; + min-width: 2.8rem; } .cp-app-name { flex-grow: 1; diff --git a/www/common/common-icons.js b/www/common/common-icons.js index 7dbddf392..87251b1e6 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -35,7 +35,7 @@ define([ "expand-pad": "maximize-2", "shrink-pad": "minimize-2", "slide": "cp-file-slide", - "poll": "file", + "poll": "file-chart-column-increasing", // Form "form": "file-chart-column-increasing", "form-responses": "chart-no-axes-combined", diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js index 75f2a2dbf..c686a00bc 100644 --- a/www/install/onboardscreen.js +++ b/www/install/onboardscreen.js @@ -43,7 +43,7 @@ define([ var nextPageForm = nextPageFunction(Env); let frame = h('div.cp-onboarding-box', nextPageForm); Env.overlay.empty().append(frame); - Lucide.createIcons(); + setTimeout(() => Lucide.createIcons()); }; const blocks = Sidebar.blocks('admin'); From 5ae2e0caa0f157b04dee251916bed6294e67d61f Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:49:42 +0300 Subject: [PATCH 9/9] remove margin --- www/settings/app-settings.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less index 8b965f2bf..8287bae84 100644 --- a/www/settings/app-settings.less +++ b/www/settings/app-settings.less @@ -280,6 +280,9 @@ &:hover { opacity: 0.7; } + svg { + margin: 0; + } } } img {