Merge branch 'master' of https://github.com/brandones/cryptpad into brandones-master

8 years ago · 18bea1db23
parent 516e25f0dc b5acdb8cc0
commit 18bea1db23
3 changed files with 13 additions and 1 deletions
--- a/www/pad/index.html
+++ b/www/pad/index.html
@ -3,6 +3,7 @@
 <head>
    <title>CryptPad</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="icon" type="image/png"
        href="/customize/main-favicon.png"
        data-main-favicon="/customize/main-favicon.png"
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@ -6,6 +6,9 @@
    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
    <script src="/bower_components/ckeditor/ckeditor.js"></script>
    <style>
    html, body {
        margin: 0px;
    }
    #cke_1_top {
        overflow: visible;
    }
--- a/www/pad/main.js
+++ b/www/pad/main.js
@ -763,9 +763,17 @@ define([
    var first = function () {
        Ckeditor = ifrw.CKEDITOR;
        if (Ckeditor) {
            //andThen(Ckeditor);
            // mobile configuration
            Ckeditor.config.toolbarCanCollapse = true;
            Ckeditor.config.height = '72vh';
            if (screen.height < 800) {
              Ckeditor.config.toolbarStartupExpanded = false;
              $('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=no');
            } else {
              $('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=yes');
            }
            second(Ckeditor);
        } else {
            console.log("Ckeditor was not defined. Trying again in %sms",interval);