Merge branch 'staging' into refactor2

This commit is contained in:
yflory 2017-11-30 17:25:23 +01:00
commit d1277d7026
2 changed files with 6 additions and 3 deletions

View File

@ -19,5 +19,8 @@
"require", "require",
"module", "module",
"__dirname" "__dirname"
] ],
"globals": {
"self": true
}
} }

View File

@ -72,12 +72,12 @@ h6 { font-size: 24px; }
overflow: hidden; overflow: hidden;
.CodeMirror { .CodeMirror {
resize: none; resize: none;
width: 100vw; //width: 100vw;
} }
&.cp-app-slide-preview { &.cp-app-slide-preview {
.CodeMirror { .CodeMirror {
//resize: horizontal; //resize: horizontal;
width: 50vw; //width: 50vw;
} }
} }
} }