Merge branch 'staging' into code2

2017-08-30 14:57:19 +02:00
parent a2ed266048 f06683e949
commit 0893bcc0e5
17 changed files with 87 additions and 67 deletions
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -43,8 +43,6 @@
    right: 0;
    display: flex;
    flex-flow: column;
-    height: 100vh;
-    width: 100vw;
 }
 .cke_toolbox_main {
    display: inline-block;
@@ -56,7 +54,7 @@
    display: flex;
    overflow: visible;
    iframe {
-        height: 100%;
+        min-height: 100%;
        width: 100%;
    }
 }