Merge branch 'update-icons' of https://github.com/cryptpad/cryptpad into update-icons

This commit is contained in:
DianaXWiki 2025-08-25 17:25:57 +03:00
commit 5e73c3cbb2
10 changed files with 30 additions and 44 deletions

View File

@ -7,8 +7,9 @@
// text #3F4141
define([
'/customize/messages.js',
'/customize/fonts/lucide.js',
'less!/customize/src/less2/include/loading.less'
], function (Messages) {
], function (Messages, Lucide) {
var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
var elem = document.createElement('div');
elem.setAttribute('id', 'cp-loading');
@ -100,6 +101,7 @@ define([
if (el2) { el2.innerHTML = makeList(data); }
var el3 = document.querySelector('.cp-loading-progress-container');
if (el3) { el3.innerHTML = makeBar(data); }
Lucide.createIcons();
} catch (e) {
}
};

View File

@ -57,8 +57,9 @@
&:hover {
cursor: pointer;
}
i.cp-icon {
font-size: 2.8rem;
.cp-icon {
height: 2.8rem;
width: 2.8rem;
}
.cp-app-name {
flex-grow: 1;

View File

@ -401,23 +401,8 @@
.cp-limit-container {
margin-top: 5px;
}
.fa.cp-app-drive-icon-expcol {
margin-left: -10px;
font-size: 14px;
position: absolute;
left: -17px;
top: 11px;
width: 11px !important;
height: 11px !important;
background-color: @cp_sidebar-left-item-bg;
padding: 0;
margin: 0;
z-index: 10;
cursor: default;
&:before {
position: relative;
top: -1px;
}
.cp-app-drive-icon-expcol {
display: inline-flex;
&:focus-visible {
outline: @variables_focus_style;
border-radius: @variables_radius_S;
@ -762,6 +747,7 @@
}
li {
display: flex;
align-items: center;
border-radius: @variables_radius;
input {
border: 1px solid transparent;

View File

@ -163,13 +163,6 @@
cursor: pointer;
border-radius: @variables_radius;
transition: none;
i, .fa, .cptools {
&:not(.nomargin) {
margin-right: 5px;
}
}
color: @cp_buttons-fg;
border: 1px solid @cp_buttons-fg;
@ -314,9 +307,6 @@
font-size: 12px;
padding: 5px;
border-radius: @variables_radius;
i {
margin-right: 10px;
}
&.cp-alert-top {
margin-top: @alertify_padding-base;
}

View File

@ -185,9 +185,6 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
i {
width: 22px;
}
span {
margin-left: 10px;
&.percent {

View File

@ -87,11 +87,6 @@
button:nth-of-type(1) {
margin-left: 0.2rem;
}
@media screen and (max-width: @browser_media-medium-screen) {
button:nth-of-type(1) {
margin-left: 0;
}
}
}
.cp-toolbar-container {
@ -101,7 +96,7 @@
.toolbar_button {
height: @toolbar_line-height;
box-sizing: border-box;
padding: 3px 10px;
padding: 3px 7px;
margin: 0;
transition: all 0.15s;
.tools_unselectable();
@ -300,7 +295,16 @@
#cp-app-toolbar-creation-dialog.cp-modal-container {
.icons_main();
h3 {
display: inline-flex;
justify-content: center;
align-items: center;
svg {
height: 2rem;
width: 2rem;
}
}
li {
color: @cp_drive-fg;
border: 1px solid @cp_drive-icon-border;

View File

@ -4643,7 +4643,7 @@ define([
(isRootOpened ? $folderOpenedIcon : $folderIcon);
var $rootElement = createTreeElement(rootName, $rootIcon.clone(), path.slice(), false, true, true, isRootOpened);
if (!manager.hasSubfolder(root)) {
$rootElement.find('.cp-app-drive-icon-expcol').css('visibility', 'hidden');
$rootElement.find('.cp-app-drive-icon-expcol').css('display', 'none');
}
$rootElement.addClass('cp-app-drive-tree-root');
$rootElement.find('>.cp-app-drive-element-row')

View File

@ -1413,6 +1413,8 @@
width: 500px;
padding: 24px;
h2 {
display: inline-flex;
align-items: center;
font-size: 20px;
line-height: 40px;
margin-top: -12px;

View File

@ -538,9 +538,6 @@
margin-right: 10px;
}
.tools_unselectable();
i {
margin-right: 5px;
}
}
.cp-kanban-filterTags-list {
margin-right: 10px;

View File

@ -32,12 +32,17 @@
#cp-filepicker-dialog {
display: none;
.lucide {
height:1.2rem;
width: 1.2rem;
margin-right: 0.2rem;
}
.cp-modal {
border-radius: @variables_radius_L;
.cp-filepicker-content {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
justify-content: center;
overflow-y: auto;
}
@ -59,6 +64,7 @@
border-radius: @variables_radius;
display: inline-flex;
justify-content: center;
flex-flow: column;
box-sizing: content-box;
@ -97,6 +103,7 @@
cursor: pointer;
width: 4rem;
height: 4rem;
margin: 0;
}
}
}