From d53d3d41cf32e26de4b72beaa69d00712da2c342 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:57:19 +0300 Subject: [PATCH] update font-size --- customize.dist/src/less2/include/forms.less | 2 +- .../src/less2/include/variables.less | 1 + www/calendar/app-calendar.less | 24 +++++++++++-------- www/calendar/inner.js | 3 ++- www/common/common-icons.js | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less index f65296d17..6ec997083 100644 --- a/customize.dist/src/less2/include/forms.less +++ b/customize.dist/src/less2/include/forms.less @@ -158,7 +158,7 @@ white-space: nowrap; text-align: center; text-transform: uppercase; - font-size: 14px; + font-size: @variables_button-font-size; text-decoration: none; cursor: pointer; border-radius: @variables_radius; diff --git a/customize.dist/src/less2/include/variables.less b/customize.dist/src/less2/include/variables.less index a92fcba97..bf832fb87 100644 --- a/customize.dist/src/less2/include/variables.less +++ b/customize.dist/src/less2/include/variables.less @@ -12,6 +12,7 @@ // Elements size @variables_bar-height: 32px; @variables_input-height: 38px; +@variables_button-font-size: 14px; // Used in modal.less and alertify.less @variables_padding: 12px; diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less index 415b5cc6d..c1e688926 100644 --- a/www/calendar/app-calendar.less +++ b/www/calendar/app-calendar.less @@ -176,7 +176,7 @@ display: inline-flex; align-items: center; svg { - font-size: 14px; + font-size: @variables_button-font-size; margin: 0; } } @@ -256,6 +256,7 @@ overflow: hidden; white-space: nowrap; font: @colortheme_app-font; + font-size: @variables_button-font-size; padding: 0 10px; &:focus{ outline: @cryptpad_color_brand solid 2px; @@ -264,6 +265,9 @@ input { flex: 1; } } } + .tui-full-calendar-content { + font-size: @variables_button-font-size; + } .tui-full-calendar-section-date-dash { height: auto; } @@ -276,11 +280,6 @@ background-color: @cp_dropdown-bg; color: @cp_dropdown-fg; border-radius: 0 0 @variables_radius @variables_radius; - li.tui-full-calendar-dropdown-menu-item { - span.tui-full-calendar-content { - font-size: 14px; - } - } li:focus-visible { outline: @cryptpad_color_brand solid 2px; } @@ -327,7 +326,7 @@ width: 100%; height: 80px; font: @colortheme_app-font; - font-size: 16px; + font-size: @variables_button-font-size; line-height: initial; padding-left: 0.3rem; pre { @@ -353,7 +352,7 @@ padding-bottom: 17px; } .tui-full-calendar-popup-detail-date { - font-size: 14px; + font-size: @variables_button-font-size; } .tui-full-calendar-section-button { margin-top: 10px; @@ -379,6 +378,7 @@ .cp-recurrence-label, .cp-notif-label { color: @cryptpad_text_col; + font-size: @variables_button-font-size; margin-right: 1rem; display: inline-flex; align-items: center; @@ -390,6 +390,9 @@ .cp-calendar-rec-translated-str { margin-top: 0.5rem; } + button { + font-size: @variables_button-font-size; + } } .cp-calendar-add-notif { @@ -397,7 +400,7 @@ align-items: baseline !important; margin: 1rem 0; * { - font-size: @colortheme_app-font-size; + font-size: @variables_button-font-size; font-weight: normal; } & > divĀ { @@ -477,6 +480,7 @@ display: inline-flex; align-items: center; gap: 0.5rem; + font-size: @variables_button-font-size; & > input { height: 40px; } @@ -485,7 +489,7 @@ outline: @cryptpad_color_brand solid 2px; } } - .btn:last-of-type { + .btn-primary-outline { svg { margin: 0; } diff --git a/www/calendar/inner.js b/www/calendar/inner.js index 5e3cfc0e7..dc1477201 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -2054,6 +2054,7 @@ APP.recurrenceRule = { return h('div.tui-full-calendar-popup-section.cp-calendar-add-notif', [ listContainer, h('div.cp-calendar-notif-form', [ + Icons.get('calendar-add-reminder'), h('span.cp-notif-label', Messages.calendar_addNotification), h('span.cp-calendar-notif-form-buttons', [ number, @@ -2188,7 +2189,7 @@ APP.recurrenceRule = { $el.find('input').attr('autocomplete', 'off'); $el.find('.tui-full-calendar-dropdown-button').addClass('btn btn-secondary'); $el.find('.tui-full-calendar-popup-close').addClass('btn btn-cancel cp-calendar-close').empty(); - $el.find('.tui-full-calendar-dropdown-arrow').append(Icons.get('chevron-down')).removeClass('tui-full-calendar-dropdown-arrow').addClass('tui-full-calendar-dropdown-arrow-custom'); + $el.find('.tui-full-calendar-dropdown-arrow').append(Icons.get('chevron-down')).removeClass('tui-full-calendar-dropdown-arrow').removeClass('tui-full-calendar-icon').addClass('tui-full-calendar-dropdown-arrow-custom'); $el.find('.tui-full-calendar-popup-close').append(Icons.get('close')); $el.find('.tui-full-calendar-section-allday').attr('tabindex', 0); $el.find('.cp-calendar-close').attr('tabindex',-1); diff --git a/www/common/common-icons.js b/www/common/common-icons.js index 6cf07275b..e73eab4e8 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -160,6 +160,7 @@ define([ "calendar-add": "calendar-plus-2", "calendar-repeat": "calendar-sync", "calendar-reminder": "bell-ring", + "calendar-add-reminder": "bell-plus", "calendar-location": "map-pin", "calendar-description": "align-justify", "closing-date": "calendar-x",