Merge branch 'MDL-56995-master' of git://github.com/damyon/moodle

theme/boost/scss/moodle.scss

@@ -41,3 +41,4 @@ $breadcrumb-divider-rtl: "◀" !default;
 @import "moodle/tool_usertours";
 @import "moodle/responsive-tabs";
 @import "moodle/bs2-compat";
+@import "moodle/print";

theme/boost/scss/moodle/core.scss

@@ -2168,3 +2168,4 @@ $footer-link-color: $brand-primary !default;
         padding-left: 1.5rem;
     }
 }
+

theme/boost/scss/moodle/print.scss

@@ -0,0 +1,14 @@
+@media print {
+    // Fix body margin for drawer in print mode.
+    body.drawer-open-left.jsenabled,
+    body.drawer-open-right.jsenabled {
+        margin: 0px;
+    }
+
+    // Safari fix see: http://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#printing.
+    .container {
+        width: auto;
+    }
+}
+
+

theme/boost/templates/columns2.mustache

@@ -71,7 +71,7 @@
         <div id="page-content" class="row">
             <div id="region-main-box" class="col-xs-12">
                 {{#hasregionmainsettingsmenu}}
-                <div id="region-main-settings-menu" {{#hasblocks}}class="has-blocks"{{/hasblocks}}>
+                <div id="region-main-settings-menu" class="hidden-print {{#hasblocks}}has-blocks{{/hasblocks}}">
                     <div> {{{ output.region_main_settings_menu }}} </div>
                 </div>
                 {{/hasregionmainsettingsmenu}}
@@ -86,7 +86,7 @@
                     </div>
                 </section>
                 {{#hasblocks}}
-                <section data-region="blocks-column">
+                <section data-region="blocks-column" class="hidden-print">
                     {{{ sidepreblocks }}}
                 </section>
                 {{/hasblocks}}

theme/boost/templates/nav-drawer.mustache

@@ -1,3 +1,3 @@
-<div id="nav-drawer" data-region="drawer" class="moodle-has-zindex {{^navdraweropen}}closed{{/navdraweropen}}" aria-hidden="{{#navdraweropen}}false{{/navdraweropen}}{{^navdraweropen}}true{{/navdraweropen}}">
+<div id="nav-drawer" data-region="drawer" class="hidden-print moodle-has-zindex {{^navdraweropen}}closed{{/navdraweropen}}" aria-hidden="{{#navdraweropen}}false{{/navdraweropen}}{{^navdraweropen}}true{{/navdraweropen}}">
     {{> theme_boost/flat_navigation }}
 </div>