Merge branch 'soon' into login

2016-12-16 18:10:35 +01:00
parent 2ee5ef2289 d09983ac92
commit 8a7fda6341
4 changed files with 466 additions and 6 deletions
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -129,8 +129,7 @@ define([

            // hide all content until the realtime doc is ready
            $(inner).css({
-                color: 'white',
-                'background-color': 'white',
+                color: '#fff',
            });
            documentBody.innerHTML = Messages.initialState;

@@ -139,8 +138,7 @@ define([
            var setEditable = module.setEditable = function (bool) {
                if (bool) {
                    $(inner).css({
-                        color: 'unset',
-                        'background-color': 'unset',
+                        color: '#333',
                    });
                    $(module.spinner.get().el).fadeOut(750);
                } else {