Merge branch 'staging' into refactor2

2017-11-30 17:25:23 +01:00 · 2017-11-30 17:25:23 +01:00 · d1277d7026
parent 5c3237e093 aca83ce72a
commit d1277d7026
2 changed files with 6 additions and 3 deletions
--- a/.jshintrc
+++ b/.jshintrc
@ -19,5 +19,8 @@
        "require",
        "module",
        "__dirname"
-    ]
+    ],
+    "globals": {
+        "self": true
+    }
 }
--- a/www/slide/app-slide.less
+++ b/www/slide/app-slide.less
@ -72,12 +72,12 @@ h6 { font-size: 24px; }
    overflow: hidden;
    .CodeMirror {
        resize: none;
-        width: 100vw;
+        //width: 100vw;
    }
    &.cp-app-slide-preview {
        .CodeMirror {
            //resize: horizontal;
-            width: 50vw;
+            //width: 50vw;
        }
    }
 }