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
5ed6d0ae3d
@ -255,11 +255,6 @@
|
||||
background-color: @cp_creation-button-bg;
|
||||
color: @cp_creation-button-fg;
|
||||
}
|
||||
.cp-creation-team-avatar {
|
||||
.fa {
|
||||
font-size: 25px;
|
||||
}
|
||||
}
|
||||
.cp-creation-team-name {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
|
||||
@ -188,12 +188,6 @@
|
||||
.cp-app-drive-element-selected {
|
||||
background: @cp_drive-selected-bg !important;
|
||||
color: @cp_drive-selected-fg;
|
||||
.fa-minus-square-o, .fa-plus-square-o {
|
||||
color: @cp_sidebar-left-fg;
|
||||
}
|
||||
.cptools {
|
||||
color: @cp_drive-selected-fg;
|
||||
}
|
||||
&.cp-app-drive-element-active {
|
||||
background: @cp_drive-selected-bg !important;
|
||||
color: @cryptpad_text_col !important;
|
||||
@ -203,9 +197,6 @@
|
||||
.cp-app-drive-element-selected-tmp {
|
||||
background: @cp_drive-selection-bg;
|
||||
color: @cp_drive-selection-fg;
|
||||
.fa-minus-square-o, .fa-plus-square-o {
|
||||
color: @cp_sidebar-left-fg;
|
||||
}
|
||||
}
|
||||
|
||||
.cp-app-drive-color-picker {
|
||||
@ -425,9 +416,6 @@
|
||||
left: -10px;
|
||||
background-color: transparent;
|
||||
}
|
||||
.cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-folder {
|
||||
margin-left: -5px;
|
||||
}
|
||||
.cp-app-drive-tree-root {
|
||||
&> .cp-app-drive-element-row {
|
||||
padding-left: 15px;
|
||||
@ -447,18 +435,18 @@
|
||||
position: relative;
|
||||
&:before {
|
||||
position: absolute;
|
||||
left: -12px;
|
||||
left: -5px;
|
||||
top: -10px;
|
||||
content: '';
|
||||
display: block;
|
||||
border-left: 1px solid @cp_drive-tree-branch;
|
||||
height: ~"calc(1em + 11px)";
|
||||
border-bottom: 1px solid @cp_drive-tree-branch;
|
||||
width: 15px;
|
||||
width: 5px;
|
||||
}
|
||||
&:after {
|
||||
position: absolute;
|
||||
left: -12px;
|
||||
left: -5px;
|
||||
bottom: -7px;
|
||||
content: '';
|
||||
display: block;
|
||||
@ -1047,7 +1035,6 @@
|
||||
}
|
||||
.cp-toolbar-bottom-right {
|
||||
.lucide-history { order: 50; }
|
||||
// .fa-list, .fa-th-large,
|
||||
.cp-app-drive-viewmode-button {
|
||||
order: 25;
|
||||
}
|
||||
|
||||
@ -421,10 +421,6 @@
|
||||
color: @toolbar-bg-color;
|
||||
color: var(--toolbar-bg-color);
|
||||
|
||||
.fa {
|
||||
font: normal normal normal 14px/1 FontAwesome;
|
||||
}
|
||||
|
||||
.tools_unselectable();
|
||||
|
||||
font: @toolbar_button-font;
|
||||
@ -544,9 +540,6 @@
|
||||
line-height: @toolbar_line-height;
|
||||
display: inline-flex;
|
||||
|
||||
.fa {
|
||||
font-size: @colortheme_app-font-size;
|
||||
}
|
||||
}
|
||||
input {
|
||||
height: @toolbar_line-height;
|
||||
@ -676,9 +669,6 @@
|
||||
font-size: 20px;
|
||||
vertical-align: middle;
|
||||
border-radius: 0 @variables_radius @variables_radius 0;
|
||||
.fa {
|
||||
font-size: 20px;
|
||||
}
|
||||
}
|
||||
.cp-toolbar-title-readonly {
|
||||
margin-left: 10px;
|
||||
|
||||
@ -356,7 +356,7 @@ define([
|
||||
$container.append($form);
|
||||
isEdit = false;
|
||||
called = false;
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
Lucide.createIcons();
|
||||
});
|
||||
};
|
||||
resetUI();
|
||||
@ -996,7 +996,6 @@ define([
|
||||
};
|
||||
|
||||
UI.passwordInput = function (opts, displayEye) {
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
opts = opts || {};
|
||||
var attributes = merge({
|
||||
type: 'password',
|
||||
@ -1046,6 +1045,7 @@ define([
|
||||
});
|
||||
}
|
||||
|
||||
Lucide.createIcons();
|
||||
return h('span.cp-password-container', [
|
||||
input,
|
||||
eye
|
||||
|
||||
@ -2961,7 +2961,6 @@ 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; }
|
||||
@ -3013,6 +3012,7 @@ define([
|
||||
$('.cp-creation-template-container').find('[tabindex]:not([tabindex="-1"])').filter(':visible').first().focus();
|
||||
});
|
||||
if (i < TEMPLATES_DISPLAYED) { $(left).addClass('hidden'); }
|
||||
Lucide.createIcons();
|
||||
};
|
||||
if (fromFileData) {
|
||||
var todo = function (thumbnail) {
|
||||
|
||||
@ -400,7 +400,7 @@ define([
|
||||
common.setHash(active);
|
||||
|
||||
setTimeout(() => { sidebar.openCategory(active); });
|
||||
setTimeout( () => Lucide.createIcons());
|
||||
Lucide.createIcons();
|
||||
$leftside.append(container);
|
||||
};
|
||||
|
||||
|
||||
@ -249,7 +249,6 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
|
||||
var $spansmall = $('<span>').append($editIcon, $editCount, $separator, $viewIcon, $viewCount);
|
||||
$userButtons.find('.cp-toolbar-userlist-button').empty().append($spansmall);
|
||||
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
if (!online || toolbar.isDeleted) { return; }
|
||||
|
||||
if (metadataMgr.isDegraded() === true) { return; }
|
||||
@ -432,6 +431,7 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
|
||||
viewText += numberOfViewUsers + ' ' + viewerText + '</div>';
|
||||
$editUsers.append(viewText);
|
||||
}
|
||||
Lucide.createIcons();
|
||||
};
|
||||
|
||||
var initUserList = function (toolbar, config) {
|
||||
|
||||
@ -185,7 +185,6 @@ define([
|
||||
var createEditModal = function (framework, kanban) {
|
||||
if (framework.isReadOnly()) { return; }
|
||||
if (editModal) { return editModal; }
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
|
||||
var dataObject = {};
|
||||
var isBoard, id;
|
||||
@ -521,6 +520,7 @@ define([
|
||||
});
|
||||
});
|
||||
|
||||
Lucide.createIcons();
|
||||
return {
|
||||
modal: modal,
|
||||
setId: setId,
|
||||
@ -1185,7 +1185,7 @@ define([
|
||||
$tag.attr('aria-pressed', 'true');
|
||||
}
|
||||
commitTags();
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
Lucide.createIcons();
|
||||
}).keydown(function (e) {
|
||||
if (e.which === 13 || e.which === 32) {
|
||||
$tag.click();
|
||||
|
||||
@ -214,7 +214,6 @@ define([
|
||||
|
||||
var mkSettingsMenu = function(framework) {
|
||||
var getSettings = function () {
|
||||
setTimeout( () => Lucide.createIcons(), 0);
|
||||
var $d = $(h('div.cp-pad-settings-dialog'));
|
||||
var common = framework._.sfCommon;
|
||||
var metadataMgr = common.getMetadataMgr();
|
||||
@ -339,6 +338,7 @@ define([
|
||||
$comments[0],
|
||||
]);
|
||||
|
||||
Lucide.createIcons();
|
||||
return $d[0];
|
||||
};
|
||||
|
||||
@ -647,7 +647,6 @@ define([
|
||||
};
|
||||
|
||||
var andThen2 = function(editor, Ckeditor, framework) {
|
||||
setTimeout(() => Lucide.createIcons());
|
||||
var mediaTagMap = {};
|
||||
var $contentContainer = $('#cke_1_contents');
|
||||
var $html = $('html');
|
||||
@ -1330,6 +1329,7 @@ define([
|
||||
}
|
||||
});
|
||||
|
||||
Lucide.createIcons();
|
||||
framework.start();
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user