infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'condition' of github.com:xwiki-labs/cryptpad into condition

pull/1/head
yflory 2021-09-02 11:59:16 +02:00
parent 3f8150d50c e53261bd2d
commit 651dfee26c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/form/app-form.less
View File

@ -179,12 +179,15 @@
.cp-form-conditional {
.cp-form-conditional-hint {
margin-bottom: 10px;
}
.cp-form-condition {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 10px;
& > *:not(:first-child) {
margin-left: 40px;
margin-left: 10px;
}
.cp-dropdown-container button {
max-width: 200px;
@ -202,8 +205,9 @@
div.cp-form-section-sortable {
min-height: 300px;
border: 4px dotted white; // XXX
border: 2px dashed @cryptpad_text_col; // XXX
padding: 20px;
margin-top: 10px;
background: @cp_app-bg;
.cp-form-creator-add-inline {
button[data-type="section"] {

5
www/form/inner.js
View File

@ -1013,7 +1013,6 @@ define([
var tag = h('div.cp-form-section-edit', [
h('i.fa.fa-question'),
h('span', Messages.form_type_section),
h('hr'),
sortable
]);
if (APP.isEditor) {
@ -3185,10 +3184,10 @@ define([
};
Messages.form_conditional = "Only show this question when:"; // XXX
Messages.form_conditional = "Only show this section when:"; // XXX
conditionalDiv = h('div.cp-form-conditional', [
h('div', Messages.form_conditional),
h('div.cp-form-conditional-hint', Messages.form_conditional),
addCondition
]);
var $condition = $(conditionalDiv);