Merge branch 'staging' into oo

7 years ago · 831c23b259
parent 5c1e5a3f49 5d584625e4
commit 831c23b259
2 changed files with 47 additions and 0 deletions
--- a/customize.dist/faq.html
+++ b/customize.dist/faq.html
@ -0,0 +1,17 @@
 <!DOCTYPE html>
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
    <noscript>
        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
    </noscript>
 </html>
--- a/customize.dist/src/less2/pages/page-faq.less
+++ b/customize.dist/src/less2/pages/page-faq.less
@ -0,0 +1,30 @@
@import (once) "../include/infopages.less";
@import (once) "../include/colortheme-all.less";
 .infopages_main();
 .infopages_topbar();
 .cp-faq-container {
    .cp-faq-questions-q {
        color: #3a84b6;
        padding: 0;
        margin-bottom: 0;
        margin-top: 5px;
        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;
    }
    .cp-faq-questions-q:hover {
        color: #2e688f;
        text-decoration: underline;
    }
    .cp-faq-questions-a {
        display: none;
        padding: 0;
    }
 }