diff --git a/customize.dist/faq.html b/customize.dist/faq.html
deleted file mode 100644
index 07a394dca..000000000
--- a/customize.dist/faq.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- CryptPad: Collaboration suite, encrypted and open-source
-
-
-
-
-
-
-
-
-
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index f885ebb9d..ab301ac96 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -62,8 +62,8 @@ define([
var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
'/imprint.html' : AppConfig.imprint);
- Msg.docs_link = "Documentation"; // XXX breaks the about menu
- // XXX Remove FAQ from translations and remove FAQ page
+ Msg.docs_link = "Documentation";
+ // XXX Remove FAQ from translations
// XXX Add FAQ to docs
Msg.footer_team = "Contributors"; // XXX existing key
Msg.footer_tos = "Terms of Service"; // XXX existing key
diff --git a/customize.dist/pages/faq.js b/customize.dist/pages/faq.js
deleted file mode 100644
index 400724b41..000000000
--- a/customize.dist/pages/faq.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define([
- 'jquery',
- '/common/hyperscript.js',
- '/customize/messages.js',
- '/customize/pages.js'
-], function ($, h, Msg, Pages) {
- return function () {
- var categories = [];
- var faq = Msg.faq;
- Object.keys(faq).forEach(function (c) {
- var questions = [];
- Object.keys(faq[c]).forEach(function (q) {
- var item = faq[c][q];
- if (typeof item !== "object") { return; }
- var answer = h('p.cp-faq-questions-a');
- var hash = c + '-' + q;
- var question = h('p.cp-faq-questions-q#' + hash);
- $(question).click(function () {
- if ($(answer).is(':visible')) {
- $(question).toggleClass('cp-active-faq');
- return void $(answer).slideUp();
- }
- $(question).toggleClass('cp-active-faq');
- $(answer).slideDown();
- var t = $(window).scrollTop();
- window.location.hash = hash;
- $(window).scrollTop(t);
- });
- questions.push(h('div.cp-faq-questions-items', [
- Pages.setHTML(question, item.q),
- Pages.setHTML(answer, item.a)
- ]));
- });
- categories.push(h('div.cp-faq-category', [
- h('h3', faq[c].title),
- h('div.cp-faq-category-questions', questions)
- ]));
- });
- var hash = window.location.hash;
- if (hash) {
- $(categories).find(hash).click();
- }
- return h('div#cp-main', [
- Pages.infopageTopbar(),
- h('div.container-fluid.cp-faq', [
- h('div.container',[
- h('center', h('h1', Msg.faq_title)),
- ]),
- ]),
- h('div.container.cp-faq-ques-det',[
- h('div.cp-faq-header.text-center', h('a.nav-item.nav-link', {
- href: '/what-is-cryptpad.html'
- }, Pages.setHTML(h('h4'),Msg.faq_whatis))),
- h('div.cp-faq-container', categories)
- ]),
- Pages.infopageFooter()
- ]);
- };
-
-});
-
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 6ea168486..fd52420b0 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -266,7 +266,7 @@
}
}
- .fa-question-circle { // help links to FAQ
+ .fa-question-circle { // help links to Docs
color: @colortheme_logo-2;
&:hover {
text-decoration: none;
diff --git a/customize.dist/src/less2/pages/page-faq.less b/customize.dist/src/less2/pages/page-faq.less
deleted file mode 100644
index 96ba157e1..000000000
--- a/customize.dist/src/less2/pages/page-faq.less
+++ /dev/null
@@ -1,86 +0,0 @@
-@import (reference) "../include/infopages.less";
-@import (reference) "../include/colortheme-all.less";
-
-&.cp-page-faq {
- .infopages_main();
-
- #cp-main {
- background: #fff;
- }
- .cp-faq {
- padding-top: 3em;
- padding-bottom: 3em;
- background-image: url(/customize/images/cover-faq.jpg);
- background-size: cover;
- background-repeat: no-repeat;
- background-position: center;
- .container {
- color: #fff;
- font-family: "Open Sans";
- }
- h1 {
- font-weight: 700;
- }
- }
-
- .cp-faq-ques-det {
- .cp-faq-header {
- a {
- padding: 0;
- h4 {
- margin-top: 1.5rem;
- margin-bottom: 1.5rem;
- .cp-brand-font {
- font-family: "Neuropolitical";
- }
- }
- }
- }
- }
- .cp-faq-container {
- .cp-faq-questions-items {
- background: #3a84b6;
- color: #fff;
- padding: 1rem 1rem 0.5rem 1rem;
- margin-bottom: 1rem;
- }
- .cp-faq-questions-q {
- padding: 0;
- margin-bottom: 0.5rem;
- cursor: pointer;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- &:hover {
- text-decoration: none;
- }
- &:after {
- content: '\f067';
- font-family: FontAwesome;
- font-weight: normal;
- font-style: normal;
- float: right;
- text-decoration: none;
- font-size: 13px;
- line-height: 1.5;
- }
- }
- .cp-faq-questions-q.active-faq {
- &:after {
- content: '\f068';
- }
- }
- .cp-faq-questions-a {
- display: none;
- padding: 0.5rem;
- margin-bottom: 0.5rem;
- background-color: #fff;
- color: #212529;
- }
- margin-bottom: 1.5rem;
- }
-}
-
diff --git a/customize.dist/template.js b/customize.dist/template.js
index e53772041..427dafd00 100644
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -54,10 +54,6 @@ $(function () {
require([ '/customize/main.js', ], function () {});
} else if (/invite/.test(pathname)) {
require([ '/invite/main.js'], function () {});
- } else if (/faq/.test(pathname)) {
- var hash = window.location.hash;
- window.location.hash = '';
- window.location.hash = hash;
} else {
require([ '/customize/main.js', ], function () {});
}
diff --git a/lib/defaults.js b/lib/defaults.js
index 21fbfe891..246994d7c 100644
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -59,7 +59,6 @@ Default.mainPages = function () {
'contact',
'what-is-cryptpad',
'features',
- 'faq',
'maintenance'
];
};