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:
DianaXWiki
commit
010929f79f
@ -141,6 +141,10 @@ define(req, function(AppConfig, Default, Language) {
|
||||
Messages.register_computer_note2 = 'remember to log out';
|
||||
Messages.register_computer_note3 = ' when you are done. Only closing the browser window leaves your account exposed.';
|
||||
Messages.register_import_note1 = 'To keep the documents you created and/or stored without being logged in, tick "Import documents from your guest session".';
|
||||
Messages.install_notes_admin = "Create your first administrator account on this page. Administrators manage instance settings including storage quotas, and have access to moderation tools.";
|
||||
Messages.install_notes_password_note1 = "Your password is the secret key that encrypts all of your documents and administrator privileges on this instance. ";
|
||||
Messages.install_notes_password_note2 = "If you lose it there is no way we can recover your data.";
|
||||
|
||||
return Messages;
|
||||
|
||||
});
|
||||
|
||||
@ -8,8 +8,9 @@ define([
|
||||
'/common/hyperscript.js',
|
||||
'/common/common-interface.js',
|
||||
'/customize/messages.js',
|
||||
'/customize/pages.js'
|
||||
], function (Config, $, h, UI, Msg, Pages) {
|
||||
'/customize/pages.js',
|
||||
'/common/common-icons.js',
|
||||
], function (Config, $, h, UI, Msg, Pages, Icons) {
|
||||
Config.adminKeys = [];
|
||||
return function () {
|
||||
// Redirect to drive if this instance already has admins
|
||||
@ -36,7 +37,25 @@ define([
|
||||
h('div.row.cp-register-det', [
|
||||
h('div#data.hidden.col-md-6', [
|
||||
h('h2', Msg.register_notes_title),
|
||||
Pages.setHTML(h('div.cp-register-notes'), Msg.install_notes)
|
||||
h('div.cp-register-notes', [
|
||||
h('ul.cp-notes-list', [
|
||||
h('li', [
|
||||
Icons.get('alert'),
|
||||
Msg.install_notes_admin
|
||||
]),
|
||||
h('li', [
|
||||
Icons.get('alert'),
|
||||
Msg.install_notes_password_note1,
|
||||
h('span.red', Msg.install_notes_password_note2)
|
||||
]),
|
||||
h('li', [
|
||||
Icons.get('alert'),
|
||||
Msg.register_computer_note1,
|
||||
h('span.red', Msg.register_computer_note2),
|
||||
Msg.register_computer_note3
|
||||
])
|
||||
])
|
||||
])
|
||||
]),
|
||||
h('div.cp-reg-form.col-md-6', [
|
||||
h('div#userForm.form-group.hidden', [
|
||||
|
||||
@ -58,8 +58,8 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
.cp-icon {
|
||||
height: 2.8rem;
|
||||
width: 2.8rem;
|
||||
min-height: 2.8rem;
|
||||
min-width: 2.8rem;
|
||||
}
|
||||
.cp-app-name {
|
||||
flex-grow: 1;
|
||||
|
||||
@ -46,6 +46,9 @@
|
||||
svg {
|
||||
margin: 0;
|
||||
}
|
||||
.lucide-star {
|
||||
fill: currentColor;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -347,7 +347,7 @@
|
||||
width: 100%;
|
||||
//flex: 1 0 auto;
|
||||
flex-wrap: nowrap;
|
||||
justify-content: space-between;
|
||||
justify-content: center;
|
||||
.cp-creation-template-more {
|
||||
margin: 0 5px;
|
||||
text-align: center;
|
||||
|
||||
@ -33,9 +33,7 @@
|
||||
margin: 0;
|
||||
}
|
||||
.cp-broadcast {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 0 0.5rem;
|
||||
margin: 0.5rem;
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
color: @cp_dropdown-fg;
|
||||
@ -59,8 +57,9 @@
|
||||
}
|
||||
}
|
||||
.cp-notification-content {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
align-items: stretch;
|
||||
align-items: center;
|
||||
min-width: 0;
|
||||
p {
|
||||
word-break: break-word;
|
||||
|
||||
@ -84,6 +84,9 @@
|
||||
outline: @variables_focus_style;
|
||||
}
|
||||
}
|
||||
svg {
|
||||
margin: 0;
|
||||
}
|
||||
button:nth-of-type(1) {
|
||||
margin-left: 0.2rem;
|
||||
}
|
||||
@ -96,7 +99,7 @@
|
||||
.toolbar_button {
|
||||
height: @toolbar_line-height;
|
||||
box-sizing: border-box;
|
||||
padding: 3px 7px;
|
||||
padding: 5px 7px;
|
||||
margin: 0;
|
||||
transition: all 0.15s;
|
||||
.tools_unselectable();
|
||||
|
||||
@ -66,6 +66,9 @@
|
||||
padding-right: 10px;
|
||||
}
|
||||
}
|
||||
h2 {
|
||||
padding-left: 30px;
|
||||
}
|
||||
h3 {
|
||||
font-weight: 700;
|
||||
margin-bottom: 1em;
|
||||
@ -112,12 +115,6 @@
|
||||
position: relative;
|
||||
li {
|
||||
margin-bottom: 10px;
|
||||
&::before {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
font-family: "FontAwesome";
|
||||
content: "\f071";
|
||||
}
|
||||
.red {
|
||||
background-color: @cp_static-danger;
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ define([
|
||||
"expand-pad": "maximize-2",
|
||||
"shrink-pad": "minimize-2",
|
||||
"slide": "cp-file-slide",
|
||||
"poll": "file",
|
||||
"poll": "file-chart-column-increasing",
|
||||
// Form
|
||||
"form": "file-chart-column-increasing",
|
||||
"form-responses": "chart-no-axes-combined",
|
||||
|
||||
@ -11,8 +11,9 @@ define([
|
||||
'/common/notifications.js',
|
||||
'/common/hyperscript.js',
|
||||
'/customize/messages.js',
|
||||
'/common/common-icons.js'
|
||||
], function ($, Util, Hash, UI, UIElements, Notifications, h, Messages, Icons) {
|
||||
'/common/common-icons.js',
|
||||
'/customize/fonts/lucide.js',
|
||||
], function ($, Util, Hash, UI, UIElements, Notifications, h, Messages, Icons, Lucide) {
|
||||
var Mailbox = {};
|
||||
|
||||
Mailbox.create = function (Common) {
|
||||
@ -187,6 +188,7 @@ define([
|
||||
if (isNotification(data.type)) {
|
||||
Notifications.add(Common, data);
|
||||
el = createElement(data);
|
||||
setTimeout(() => Lucide.createIcons());
|
||||
}
|
||||
f(data, el);
|
||||
} catch (e) {
|
||||
|
||||
@ -3101,6 +3101,7 @@ define([
|
||||
});
|
||||
$results.empty().append(elements);
|
||||
if (header) { $results.prepend(header); }
|
||||
Lucide.createIcons();
|
||||
};
|
||||
show(answers);
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ define([
|
||||
var nextPageForm = nextPageFunction(Env);
|
||||
let frame = h('div.cp-onboarding-box', nextPageForm);
|
||||
Env.overlay.empty().append(frame);
|
||||
Lucide.createIcons();
|
||||
setTimeout(() => Lucide.createIcons());
|
||||
};
|
||||
const blocks = Sidebar.blocks('admin');
|
||||
|
||||
|
||||
@ -280,6 +280,9 @@
|
||||
&:hover {
|
||||
opacity: 0.7;
|
||||
}
|
||||
svg {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
img {
|
||||
|
||||
@ -354,13 +354,13 @@ define([
|
||||
textColor = text;
|
||||
$modal.css('color', text);
|
||||
$modal.css('border-color', text);
|
||||
$('#' + SLIDE_COLOR_ID).find('i').css('color', text);
|
||||
$('#' + SLIDE_COLOR_ID).find('svg').css('color', text);
|
||||
slideOptions.textColor = text;
|
||||
}
|
||||
if (back) {
|
||||
backColor = back;
|
||||
$modal.find('.cp-app-slide-frame').css('background-color', back);
|
||||
$('#' + SLIDE_BACKCOLOR_ID).find('i').css('color', back);
|
||||
$('#' + SLIDE_BACKCOLOR_ID).find('svg').css('color', back).css('fill', back);
|
||||
slideOptions.bgColor = back;
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user