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 branch 'update-icons' of https://github.com/cryptpad/cryptpad into update-icons

Browse Source
This commit is contained in:
DianaXWiki 2025-08-22 14:43:43 +03:00
commit ff97aa7872
8 changed files with 49 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
customize.dist/src/less2/include/creation.less
View File

@ -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;
}

4
customize.dist/src/less2/include/fileupload.less
View File

@ -49,6 +49,10 @@
&:hover {
color: lighten(@cp_upload-fg, 10%);
}
svg {
margin: 0;
}
}
}
#cp-fileupload-table {

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

@ -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 {

31
www/calendar/app-calendar.less
View File

@ -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;
}

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

@ -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",
"drive-upload-file": "file-up",
"drive-upload-folder": "folder-up",
"file": "file",

1
www/common/common-ui-elements.js
View File

@ -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; }

7
www/common/sframe-common-file.js
View File

@ -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)
$('<td>', {'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();
};

24
www/common/toolbar.js
View File

@ -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();
});
};