Merge branch 'de-translation-pl' into staging

7 years ago · 123612b893
parent e5c35f457c 8b13bd0be5
commit 123612b893
2 changed files with 1089 additions and 55 deletions
--- a/customize.dist/translations/messages.de.js
+++ b/customize.dist/translations/messages.de.js
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@ -3,6 +3,43 @@
 <head>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <script async data-bootload="/pad/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+    html, body {
+        margin: 0px;
+    }
+    #cke_1_top {
+        overflow: visible;
+        padding: 0px;
+        display: flex;
+    }
+    #cke_1_toolbox {
+        display: inline-block;
+        width: 100%;
+        background-color: #c1e7ff;
+    }
+    #cke_1_toolbox .cke_toolbar {
+        height: 28px;
+        padding: 2px 0;
+    }
+    #cke_1_top .cryptpad-toolbar {
+        padding: 0;
+        display: block;
+    }
+    .cke_wysiwyg_frame {
+        min-width: 60%;
+    }
+
+
+	@media print {
+		#cke_1_top { 
+			display:none;
+		}
+		body.app-pad .userlist-drawer {
+		  display:none;
+		}
+	}
+
+    </style>
 </head>
 <body class="cp-app-pad">
    <textarea style="display:none" id="editor1" name="editor1"></textarea>