Merge branch 'MDL-74172-master' of https://github.com/bmbrands/moodle

UniGe · Mar 17, 2022 · 12252eb · 12252eb
2 parents 1ccea2c + e71f567
commit 12252eb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/lib/templates/full_header.mustache b/lib/templates/full_header.mustache
@@ -29,7 +29,7 @@
         "welcomemessage": "welcomemessage"
     }
 }}
-<header id="page-header" class="header-maxwidth">
+<header id="page-header" class="header-maxwidth d-print-none">
     <div class="w-100">
         <div class="d-flex flex-wrap">
             {{#hasnavbar}}

diff --git a/theme/boost/scss/moodle/tertiarynavigation.scss b/theme/boost/scss/moodle/tertiarynavigation.scss
@@ -15,3 +15,9 @@
         margin-right: 20px;
     }
 }
+
+@media print {
+    .tertiary-navigation {
+        display: none;
+    }
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -21610,6 +21610,10 @@ div.editor_atto_toolbar button .icon {
   .tertiary-navigation .navitem:not(:last-child) {
     margin-right: 20px; }
 
+@media print {
+  .tertiary-navigation {
+    display: none; } }
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale; }

diff --git a/theme/boost/templates/drawer.mustache b/theme/boost/templates/drawer.mustache
@@ -27,7 +27,7 @@
     }
 }}
 <div {{!
-    }} class="{{$drawerclasses}}{{/drawerclasses}} not-initialized"{{!
+    }} class="{{$drawerclasses}}{{/drawerclasses}} d-print-none not-initialized"{{!
     }} data-region="fixed-drawer"{{!
     }} id="{{$id}}{{/id}}"{{!
     }} data-preference="{{$drawerpreferencename}}{{/drawerpreferencename}}"{{!

diff --git a/theme/boost/templates/drawers.mustache b/theme/boost/templates/drawers.mustache
@@ -93,7 +93,7 @@
         <div id="topofscroll" class="main-inner">
             <div class="drawer-toggles d-flex">
                 {{#courseindex}}
-                    <div class="drawer-toggler drawer-left-toggle open-nav">
+                    <div class="drawer-toggler drawer-left-toggle open-nav d-print-none">
                         <button
                             class="btn icon-no-margin"
                             data-toggler="drawers"
@@ -109,7 +109,7 @@
                     </div>
                 {{/courseindex}}
                 {{#hasblocks}}
-                    <div class="drawer-toggler drawer-right-toggle ml-auto">
+                    <div class="drawer-toggler drawer-right-toggle ml-auto d-print-none">
                         <button
                             class="btn icon-no-margin"
                             data-toggler="drawers"
@@ -128,7 +128,7 @@
             </div>
             {{{ output.full_header }}}
             {{#secondarymoremenu}}
-                <div class="secondary-navigation">
+                <div class="secondary-navigation d-print-none">
                     {{> core/moremenu}}
                 </div>
             {{/secondarymoremenu}}

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -21556,6 +21556,10 @@ div.editor_atto_toolbar button .icon {
   .tertiary-navigation .navitem:not(:last-child) {
     margin-right: 20px; }
 
+@media print {
+  .tertiary-navigation {
+    display: none; } }
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale; }