From b792108bc18d4fcb7c6026ecad23e430e067ba43 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 25 Aug 2019 11:30:26 +0100
Subject: [PATCH] Updated print css for recent redesign

Fixes #1472
---
 resources/assets/sass/print-styles.scss  | 33 ++++++++++--------------
 resources/views/base.blade.php           |  2 +-
 resources/views/chapters/show.blade.php  |  2 +-
 resources/views/pages/revision.blade.php |  2 +-
 resources/views/pages/show.blade.php     |  4 +--
 resources/views/tri-layout.blade.php     |  2 +-
 6 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/resources/assets/sass/print-styles.scss b/resources/assets/sass/print-styles.scss
index 44107f2d4..296afbe76 100644
--- a/resources/assets/sass/print-styles.scss
+++ b/resources/assets/sass/print-styles.scss
@@ -4,39 +4,32 @@ header {
   display: none;
 }
 
-body {
+html, body {
   font-size: 12px;
+  background-color: #FFF;
 }
 
 .page-content {
   margin: 0 auto;
 }
 
-.flex-fill {
-  display: block;
-}
-
-.flex.sidebar + .flex.content {
-  border-left: none;
-}
-
 .print-hidden {
-  display: none;
+  display: none !important;
 }
 
-.print-full-width {
-  width: 100%;
-  float: none;
+.tri-layout-container {
+  grid-template-columns: 1fr;
+  grid-template-areas: "b";
+  margin-left: 0;
+  margin-right: 0;
   display: block;
 }
 
-h2 {
-  font-size: 2em;
-  line-height: 1;
-  margin-top: 0.6em;
-  margin-bottom: 0.3em;
+.card {
+  box-shadow: none;
 }
 
-.comments-container {
-  display: none;
+.content-wrap.card {
+  padding-left: 0;
+  padding-right: 0;
 }
\ No newline at end of file
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index bb0a8cdda..c7fba7b64 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -34,7 +34,7 @@
         @yield('content')
     </section>
 
-    <div back-to-top class="primary-background">
+    <div back-to-top class="primary-background print-hidden">
         <div class="inner">
             @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
         </div>
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index eea2e90cc..c343115a9 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -8,7 +8,7 @@
 
 @section('body')
 
-    <div class="mb-m">
+    <div class="mb-m print-hidden">
         @include('partials.breadcrumbs', ['crumbs' => [
             $chapter->book,
             $chapter,
diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index 3ce5b349f..e897522cb 100644
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -11,7 +11,7 @@
 
 @section('body')
 
-    <div class="mb-m">
+    <div class="mb-m print-hidden">
         @include('partials.breadcrumbs', ['crumbs' => [
             $page->$book,
             $page->chapter,
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 3b688161c..4c6b63d48 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('body')
 
-    <div class="mb-m">
+    <div class="mb-m print-hidden">
         @include('partials.breadcrumbs', ['crumbs' => [
             $page->book,
             $page->hasChapter() ? $page->chapter : null,
@@ -18,7 +18,7 @@
     </div>
 
     @if ($commentsEnabled)
-        <div class="container small p-none comments-container mb-l">
+        <div class="container small p-none comments-container mb-l print-hidden">
             @include('comments.comments', ['page' => $page])
             <div class="clearfix"></div>
         </div>
diff --git a/resources/views/tri-layout.blade.php b/resources/views/tri-layout.blade.php
index 00e9df2f9..d869d6f13 100644
--- a/resources/views/tri-layout.blade.php
+++ b/resources/views/tri-layout.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
 
-    <div class="tri-layout-mobile-tabs text-primary" >
+    <div class="tri-layout-mobile-tabs text-primary print-hidden">
         <div class="grid half no-break no-gap">
             <div class="tri-layout-mobile-tab px-m py-s" tri-layout-mobile-tab="info">
                 {{ trans('common.tab_info') }}