mirror of
https://github.com/cryptpad/cryptpad.git
synced 2026-09-14 11:05:41 +05:00
Merge branch 'update-icons' of https://github.com/cryptpad/cryptpad into update-icons
This commit is contained in:
commit
53690e1482
@ -16,13 +16,7 @@
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.fa {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
svg {
|
||||
&:hover {
|
||||
color: darken(@cryptpad_color_brand, 10%);
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ define([
|
||||
var folderOpen = 'folder-open';
|
||||
var sharedFolder = 'drive-shared-folder';
|
||||
var expandAll = 'expand';
|
||||
var collapseAll = 'collapse-all';
|
||||
var collapseAll = 'collapse';
|
||||
var readOnly = 'read-only';
|
||||
var preview = 'preview';
|
||||
var rename = 'rename';
|
||||
@ -362,8 +362,7 @@ define([
|
||||
APP.premiumPlan = priv.plan;
|
||||
var getOpenIn = function (app) {
|
||||
var icon = AppConfig.applicationsIcon[app];
|
||||
var cls = icon.indexOf('cptools') === 0 ? 'cptools '+icon : 'fa '+icon;
|
||||
var html = '<i class="'+cls+'"></i>' + Messages.type[app];
|
||||
var html = '<i data-lucide="'+icon+'"></i>' + Messages.type[app];
|
||||
return Messages._getKey('fc_openIn', [html]);
|
||||
};
|
||||
var restricted = {};
|
||||
|
||||
@ -544,16 +544,16 @@ define([
|
||||
curve = __channel.curvePublic;
|
||||
}
|
||||
|
||||
var unmute = h('span', Icons.get('notification', {
|
||||
var unmute = h('span', Icons.get('notification'), {
|
||||
class: 'cp-app-contacts-remove cp-unmute-icon',
|
||||
title: Messages.contacts_unmute || 'unmute',
|
||||
style: (curve && mutedUsers[curve]) ? undefined : 'display: none;'
|
||||
}));
|
||||
var mute = h('span', Icons.get('mute', {
|
||||
});
|
||||
var mute = h('span', Icons.get('mute'), {
|
||||
class: 'cp-app-contacts-remove cp-mute-icon',
|
||||
title: Messages.contacts_mute || 'mute',
|
||||
style: (curve && mutedUsers[curve]) ? 'display: none;' : undefined
|
||||
}));
|
||||
});
|
||||
var remove = h('span', Icons.get('unfriend', {
|
||||
class: 'cp-app-contacts-remove',
|
||||
title: Messages.contacts_remove
|
||||
@ -922,6 +922,8 @@ define([
|
||||
if (e) { return void console.error(e); }
|
||||
$(button).closest('div').remove();
|
||||
if (!data) { $button.hide(); }
|
||||
$('.cp-app-contacts-friend[data-user="'+curve+'"]')
|
||||
.find('.cp-unmute-icon').hide();
|
||||
$('.cp-app-contacts-friend[data-user="'+curve+'"]')
|
||||
.find('.cp-mute-icon').show();
|
||||
if ($('.cp-contacts-muted-table').find('.cp-contacts-muted-user').length === 0) {
|
||||
|
||||
@ -263,6 +263,7 @@ define([
|
||||
$('button.cancel').click(); // Close any existing alertify
|
||||
displayed = undefined;
|
||||
create[type](data);
|
||||
Lucide.createIcons();
|
||||
});
|
||||
|
||||
UI.removeLoadingScreen();
|
||||
|
||||
@ -1882,6 +1882,7 @@ define([
|
||||
title: Messages.profile_remove_avatar
|
||||
}, Icons.get('close'));
|
||||
$avatar.append(delButton);
|
||||
Lucide.createIcons();
|
||||
$(delButton).click(() => {
|
||||
const old = APP.profileData?.avatar;
|
||||
APP.profile.execCommand("SET", {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user