The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/update-icons' into 2025.9-test

Browse Source
This commit is contained in:
yflory 2025-10-08 11:58:16 +02:00
commit e06700a88f
15 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/src/less2/include/drive.less
View File

@ -586,6 +586,7 @@
&:hover {
&:not(.-cp-app-drive-element-selected, .cp-app-drive-element-selected-tmp) {
background-color: @cp_drive-icon-hover;
cursor: pointer;
}
}
}

2
customize.dist/src/less2/include/sidebar-layout.less
View File

@ -298,7 +298,7 @@
margin: 10px 0;
}
button.btn {
margin: 0 @sidebar_base-margin 0 0;
//margin: 0 @sidebar_base-margin 0 0;
&:last-child {
margin-right: 0;
}

3
customize.dist/src/less2/include/toolbar.less
View File

@ -802,7 +802,7 @@
.cp-dropdown-button-title {
position: absolute;
bottom: 10px;
right: 10px;
right: 13px;
font-size: 14px;
border: 1px solid;
border-radius: 50%;
@ -842,7 +842,6 @@
text-decoration: none;
position: absolute;
height: auto;
padding: 10px;
color: @toolbar-bg-color;
color: var(--toolbar-bg-color);
border-radius: @variables_radius;

3
customize.dist/src/less2/pages/page-index.less
View File

@ -174,7 +174,6 @@
align-items: center;
justify-content: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 16px;
}
@ -190,6 +189,8 @@
.pad-button-text {
color: @cryptpad_text_col;
padding: 5px;
white-space: wrap;
text-align: center;
}
}
.cp-index-appitem {

2
www/common/common-icons.js
View File

@ -181,6 +181,7 @@ define([
"tag": "hash",
"password-reveal": "eye",
"password-hide": "eye-closed",
"password-change": "rotate-ccw-key",
"arrow-left": "arrow-left",
"arrow-up": "arrow-up",
"code": "code-xml",
@ -198,6 +199,7 @@ define([
"restore": "rotate-cw",
"all": "menu",
"chat": "message-circle-more",
"comments": "message-square-more",
"mail": "mail",
"upload-avatar": "image-up",
"edit": "pencil",

2
www/common/inner/mfa.js
View File

@ -134,7 +134,7 @@ define([
return;
}
var button = h('button.btn.btn-primary', Messages.mfa_setup_button);
var button = h('button.btn.btn-primary', [Icons.get('lock'), Messages.mfa_setup_button]);
var $mfaSetupBtn = $(button);
var pwInput;
$content.append(h('div.cp-password-container', [

4
www/common/make-backup.js
View File

@ -503,13 +503,13 @@ define([
});
};
var download = h('button.btn.btn-primary', Messages.download_mt_button);
var download = h('button.btn.btn-primary', [Icons.get('download'), Messages.download_mt_button]);
var completed = false;
var complete = function(h, err) {
if (completed) { return; }
completed = true;
$(progress).find('svg').empty().append(Icons.get('checked-box'));
$(cancel).text(Messages.filePicker_close).off('click').click(function() {
$(cancel).empty().append(Icons.get('close'), Messages.filePicker_close).off('click').click(function() {
_onCancel.forEach(function(h) { h(); });
});
$(download).click(h).appendTo(actions);

12
www/form/app-form.less
View File

@ -397,6 +397,14 @@
padding-bottom: 20px;
margin-bottom: 20px;
border-bottom: 1px solid @cryptpad_text_col;
.cp-form-condition {
.btn-danger-alt,
.btn-secondary {
svg {
margin: 0;
}
}
}
}
}
@ -1494,7 +1502,7 @@
margin: 0.2rem 0;
}
.cp-form-status {
margin-bottom: 0.2rem;
margin-bottom: 0.5rem;
}
.cp-form-mute-radio {
margin-top: 0.2rem;
@ -1504,7 +1512,7 @@
}
.cp-form-results-type {
display: inline-block;
margin: 0.2rem 0 0.2rem 0;
margin: 0.5rem 0 0.5rem 0;
}
}
}

13
www/form/inner.js
View File

@ -3645,9 +3645,8 @@ define([
h('span.cp-form-anon-answer-registered', user.name || Messages.anonymous)
]));
}
var send = h('button.cp-open.btn.btn-primary', APP.hasAnswered ? Messages.form_update : Messages.form_submit);
var reset = h('button.cp-open.cp-reset-button.btn.btn-danger-alt', Messages.form_reset);
var send = h('button.cp-open.btn.btn-primary', [Icons.get('send'), APP.hasAnswered ? Messages.form_update : Messages.form_submit]);
var reset = h('button.cp-open.cp-reset-button.btn.btn-danger-alt', [Icons.get('restore'), Messages.form_reset]);
var $reset = $(reset).click(function () {
if (!Array.isArray(APP.formBlocks)) { return; }
APP.formBlocks.forEach(function (data) {
@ -3709,7 +3708,7 @@ define([
window.onbeforeunload = undefined;
$send.removeAttr('disabled');
$send.text(Messages.form_update);
$send.empty().append(Icons.get('send'), Messages.form_update);
APP.answeredInForm = false;
APP.getMyAnswers();
@ -3772,7 +3771,7 @@ define([
var $container = $('div.cp-form-creator-content');
var $inputs = $container.find('input:invalid');
if (!$inputs.length) {
$send.text(APP.hasAnswered ? Messages.form_update : Messages.form_submit);
$send.empty().append(Icons.get('send'), APP.hasAnswered ? Messages.form_update : Messages.form_submit);
return void $invalid.empty();
}
$send.text(APP.hasAnswered ? Messages.form_updateWarning : Messages.form_submitWarning);
@ -4865,7 +4864,7 @@ define([
var $results = $(resultsType);
var refreshPublic = function () {
$results.empty();
var makePublic = h('button.btn.btn-secondary', Messages.form_makePublic);
var makePublic = h('button.btn.btn-secondary', [Icons.get('access'), Messages.form_makePublic]);
var makePublicDiv = h('div.cp-form-actions', makePublic);
if (content.answers.privateKey) { makePublicDiv = undefined; }
var publicText = content.answers.privateKey ? Messages.form_isPublic : Messages.form_isPrivate;
@ -5098,7 +5097,7 @@ define([
$endDateStr.text(text);
var button = h('button.btn.btn-secondary', buttonTxt);
var button = h('button.btn.btn-secondary', [Icons.get('expire'), buttonTxt]);
var $button = $(button).click(function () {
$button.attr('disabled', 'disabled');

2
www/notifications/app-notifications.less
View File

@ -126,6 +126,8 @@
justify-content: flex-start;
align-items: center;
margin: 0.1rem;
white-space: normal;
word-break: break-word;
&:focus-visible {
outline: @variables_focus_style;
border-radius: @variables_radius;

2
www/pad/comments.js
View File

@ -319,7 +319,7 @@ define([
var showBtn = h('button.cp-pad-show.btn.btn-default', {
title: Messages.poll_comment_list
}, [
Icons.get('chat')
Icons.get('comments')
]);

2
www/settings/app-settings.less
View File

@ -225,7 +225,7 @@
}
button {
svg {
margin: 0 0 0 0.2rem;
margin-right: @variables_icon_margin
}
}
}

2
www/settings/inner.js
View File

@ -638,7 +638,7 @@ define([
placeholder: Messages.settings_changePasswordNewConfirm,
autocomplete: 'new-password',
}, true),
h('button.btn.btn-primary', Messages.settings_changePasswordButton)
h('button.btn.btn-primary', [ Icons.get('password-change'), Messages.settings_changePasswordButton ])
]);
$(form).appendTo($div);

3
www/slide/app-slide.less
View File

@ -255,6 +255,9 @@
opacity: 0.6;
display: none;
z-index: 9001;
svg {
color: @cryptpad_text_col;
}
}
.cp-app-slide-modal-button:hover {
opacity: 1;

3
www/teams/app-team.less
View File

@ -249,6 +249,9 @@
button:not(:last-child) {
margin-right: 5px;
}
.btn {
margin-bottom: 5px;
}
}
.cp-team-roster-member {
display: flex;