diff --git a/customize.dist/fonts/cptools/fonts/cptools.eot b/customize.dist/fonts/cptools/fonts/cptools.eot
new file mode 100644
index 000000000..dbfc79bf7
Binary files /dev/null and b/customize.dist/fonts/cptools/fonts/cptools.eot differ
diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg
index 12d2fe9d6..29461075f 100644
--- a/customize.dist/fonts/cptools/fonts/cptools.svg
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -7,28 +7,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -38,4 +38,5 @@
+
\ No newline at end of file
diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf
index 788b7f881..41ae6ef37 100644
Binary files a/customize.dist/fonts/cptools/fonts/cptools.ttf and b/customize.dist/fonts/cptools/fonts/cptools.ttf differ
diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff
index f2faf5aa2..dca533fcd 100644
Binary files a/customize.dist/fonts/cptools/fonts/cptools.woff and b/customize.dist/fonts/cptools/fonts/cptools.woff differ
diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css
index 874b6068f..7b3227453 100644
--- a/customize.dist/fonts/cptools/style.css
+++ b/customize.dist/fonts/cptools/style.css
@@ -1,10 +1,10 @@
@font-face {
font-family: 'cptools';
- src: url('fonts/cptools.eot?chd5a1');
- src: url('fonts/cptools.eot?chd5a1#iefix') format('embedded-opentype'),
- url('fonts/cptools.ttf?chd5a1') format('truetype'),
- url('fonts/cptools.woff?chd5a1') format('woff'),
- url('fonts/cptools.svg?chd5a1#cptools') format('svg');
+ src: url('fonts/cptools.eot?6tk5ck');
+ src: url('fonts/cptools.eot?6tk5ck#iefix') format('embedded-opentype'),
+ url('fonts/cptools.ttf?6tk5ck') format('truetype'),
+ url('fonts/cptools.woff?6tk5ck') format('woff'),
+ url('fonts/cptools.svg?6tk5ck#cptools') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@@ -14,7 +14,7 @@
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'cptools' !important;
display: inline-block;
- speak: none;
+ speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
@@ -26,6 +26,9 @@
-moz-osx-font-smoothing: grayscale;
}
+.cptools-form-conditional:before {
+ content: "\e900";
+}
.cptools-form-poll:before {
content: "\e910";
}
@@ -57,65 +60,65 @@
content: "\e91d";
}
.cptools-folder-no-color:before {
- content: "\e900";
+ content: "\e901";
}
.cptools-whiteboard:before {
- content: "\e901";
+ content: "\e902";
}
.cptools-new-template:before {
- content: "\e902";
+ content: "\e903";
}
.cptools-shared-folder:before {
- content: "\e903";
+ content: "\e904";
}
.cptools-file-upload:before {
- content: "\e904";
+ content: "\e905";
}
.cptools-template:before {
- content: "\e905";
+ content: "\e906";
}
.cptools-poll:before {
- content: "\e906";
+ content: "\e907";
}
.cptools-slide:before {
- content: "\e907";
+ content: "\e908";
}
.cptools-sheet:before {
- content: "\e908";
+ content: "\e909";
}
.cptools-folder-open:before {
- content: "\e909";
+ content: "\e90a";
}
.cptools-kanban:before {
- content: "\e90a";
+ content: "\e90b";
}
.cptools-folder:before {
- content: "\e90b";
+ content: "\e90c";
}
.cptools-shared-folder-open:before {
- content: "\e90c";
+ content: "\e90d";
}
.cptools-code:before {
- content: "\e90d";
+ content: "\e90e";
}
.cptools-richtext:before {
- content: "\e90e";
+ content: "\e90f";
}
.cptools-file:before {
- content: "\e90f";
+ content: "\e911";
}
.cptools-palette:before {
- content: "\e911";
+ content: "\e912";
}
.cptools-folder-upload:before {
- content: "\e912";
+ content: "\e913";
}
.cptools-add-bottom:before {
- content: "\e913";
+ content: "\e914";
}
.cptools-add-top:before {
- content: "\e914";
+ content: "\e915";
}
.cptools-destroy:before {
- content: "\e915";
+ content: "\e91f";
}
diff --git a/www/form/app-form.less b/www/form/app-form.less
index d16aa9ce2..acf9051dd 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -215,7 +215,7 @@
min-height: 300px;
border: 2px dashed @cryptpad_text_col; // XXX
padding: 20px;
- margin-top: 10px;
+ margin-top: 20px;
background: @cp_app-bg;
.cp-form-creator-add-inline {
button[data-type="section"] {
diff --git a/www/form/inner.js b/www/form/inner.js
index e3a2021b5..c30bc99d1 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1060,7 +1060,7 @@ define([
};
},
printResults: function () { return; },
- icon: h('i.fa.fa-question')
+ icon: h('i.cptools.cptools-form-conditional')
},
};
@@ -2329,7 +2329,7 @@ define([
}
var viewOnly = content.answers.cantEdit || APP.isClosed;
- var action = h('button.btn.btn-primary', [
+ var action = h(viewOnly ? 'button.btn.btn-secondary' : 'button.btn.btn-primary', [
viewOnly ? h('i.fa.fa-bar-chart') : h('i.fa.fa-pencil'),
h('span', viewOnly ? Messages.form_viewAnswer : Messages.form_editAnswer)
]);
@@ -2351,19 +2351,20 @@ define([
if (answers._time) { APP.lastAnswerTime = answers._time; }
+ Messages.form_viewAllAnswers = "View all responses ({0})"; // XXX
// If responses are public, show button to view them
var responses;
if (content.answers.privateKey) {
var l = getAnswersLength(answers);
- responses = h('button.btn.btn-default', [
+ responses = h('button.btn.btn-secondary', [
h('i.fa.fa-bar-chart'),
- h('span.cp-button-name', Messages._getKey('form_results', [l]))
+ h('span.cp-button-name', Messages._getKey('form_viewAllAnswers', [l]))
]);
var sframeChan = framework._.sfCommon.getSframeChannel();
sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
var answers = obj && obj.results;
var l = getAnswersLength(answers);
- $(responses).find('.cp-button-name').text(Messages._getKey('form_results', [l]));
+ $(responses).find('.cp-button-name').text(Messages._getKey('form_viewAllAnswers', [l]));
});
$(responses).click(function () {
sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
@@ -3014,16 +3015,16 @@ define([
}).filter(Boolean);
return values;
};
- Messages.form_conditional_add = "Add condition OR";
- Messages.form_conditional_addAnd = "Add condition AND";
- var addCondition = h('button.btn.btn-default', [
+ Messages.form_conditional_add = "Add condition OR"; // XXX
+ Messages.form_conditional_addAnd = "Add condition AND"; // XXX
+ var addCondition = h('button.btn.btn-secondary', [
h('i.fa.fa-plus'),
h('span', Messages.form_conditional_add)
]);
var $addC = $(addCondition);
var getConditions;
var getAddAndButton = function ($container, rules) {
- var btn = h('button.btn.btn-default.cp-form-add-and', [
+ var btn = h('button.btn.btn-secondary.cp-form-add-and', [
h('i.fa.fa-plus'),
h('span', Messages.form_conditional_addAnd)
]);
@@ -3055,7 +3056,7 @@ define([
options: qOptions, // Entries displayed in the menu
isSelect: true,
caretDown: true,
- buttonCls: 'btn btn-secondary'
+ buttonCls: 'btn btn-default'
};
var qSelect = UIElements.createDropdown(qConfig);
Messages.form_condition_is = 'is'; // XXX
@@ -3083,14 +3084,14 @@ define([
options: iOptions, // Entries displayed in the menu
isSelect: true,
caretDown: true,
- buttonCls: 'btn btn-secondary'
+ buttonCls: 'btn btn-default'
};
var iSelect = UIElements.createDropdown(iConfig);
iSelect.setValue(isOn ? 1 : 0);
$(iSelect).hide();
var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
- h('i.fa.fa-times')
+ h('i.fa.fa-times.nomargin')
]);
$(remove).on('click', function () {
$content.remove();
@@ -3147,7 +3148,7 @@ define([
//container: $(type),
isSelect: true,
caretDown: true,
- buttonCls: 'btn btn-secondary'
+ buttonCls: 'btn btn-default'
};
var vSelect = UIElements.createDropdown(vConfig);
vSelect.addClass('cp-form-condition-values');
@@ -3829,7 +3830,7 @@ define([
refreshResponse();
// Make answers anonymous
- Messages.form_makeAnon = "Anonymous responses"; // XXX
+ Messages.form_makeAnon = "Anonymize responses"; // XXX
var anonContainer = h('div.cp-form-anon-container');
var $anon = $(anonContainer);
var refreshAnon = function () {