diff --git a/customize.dist/src/less2/include/app-print.less b/customize.dist/src/less2/include/app-print.less
index e4c344b20..7f42f100b 100644
--- a/customize.dist/src/less2/include/app-print.less
+++ b/customize.dist/src/less2/include/app-print.less
@@ -9,10 +9,6 @@
max-height: none;
overflow: visible;
display: block;
- @page {
- margin: 0;
- size: landscape;
- }
// Slide app
body.cp-app-slide {
display: block;
@@ -48,11 +44,15 @@
// Code app
body.cp-app-code {
display: block;
+ height: auto;
* {
visibility: hidden;
height: auto;
max-height: none;
}
+ .cp-toolbar-userlist-drawer {
+ display: none;
+ }
#cme_toolbox {
display: none;
}
@@ -64,6 +64,7 @@
#cp-app-code-preview {
display: block;
#cp-app-code-print {
+ font-size: 20px;
display: block;
overflow: visible !important;
width: 100%;
diff --git a/customize.dist/src/print-landscape.css b/customize.dist/src/print-landscape.css
new file mode 100644
index 000000000..26a9d495e
--- /dev/null
+++ b/customize.dist/src/print-landscape.css
@@ -0,0 +1,5 @@
+@page {
+ margin: 0;
+ size: A4 landscape;
+}
+
diff --git a/customize.dist/src/print.css b/customize.dist/src/print.css
new file mode 100644
index 000000000..1baf803d4
--- /dev/null
+++ b/customize.dist/src/print.css
@@ -0,0 +1,4 @@
+@page {
+ margin: 3cm;
+ size: A4 portrait;
+}
diff --git a/www/code/app-code.less b/www/code/app-code.less
index 0ca86fd8b..6557d39f6 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -136,7 +136,6 @@
#cp-app-code-print {
position: relative;
display: none;
- margin: 50px;
.markdown_preformatted-code;
.markdown_gfm-table(black);
}
diff --git a/www/code/inner.js b/www/code/inner.js
index 1956ab3f4..68b58bce4 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -42,6 +42,7 @@ define([
'cm/addon/fold/comment-fold',
'cm/addon/display/placeholder',
+ 'css!/customize/src/print.css',
'less!/code/app-code.less'
], function (
diff --git a/www/pad/inner.html b/www/pad/inner.html
index b7ccd4d00..e4dbcdf95 100644
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@@ -1,5 +1,5 @@
-
+
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 19c2063d8..eeabbb337 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -47,6 +47,7 @@ define([
'/bower_components/diff-dom/diffDOM.js',
+ 'css!/customize/src/print.css',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/pad/app-pad.less'
@@ -500,6 +501,12 @@ define([
var mkPrintButton = function (framework, editor) {
var $printButton = framework._.sfCommon.createButton('print', true);
$printButton.click(function () {
+ /*
+ // NOTE: alternative print system in case we keep having more issues on Firefox
+ var $iframe = $('html').find('iframe');
+ var iframe = $iframe[0].contentWindow;
+ iframe.print();
+ */
editor.execCommand('print');
framework.feedback('PRINT_PAD');
});
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 3af7185c5..de30eb9fc 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -15,6 +15,7 @@ define([
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+ 'css!/customize/src/print-landscape.css',
'less!/slide/app-slide.less',
'css!cm/lib/codemirror.css',