ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / resources / sass / _layout.scss

diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index ac0e96a901b96a16cef76f0f671373c44e915370..6c78419d86c96d3867fbcaa691aafeb0d0f6d90e 100644 (file)
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -266,10 +266,18 @@ body.flexbox {
   display: none !important;
 }
 
   display: none !important;
 }
 

-.fill-height {
+.overflow-hidden {
+  overflow: hidden;
+}
+
+.height-fill {

   height: 100%;
 }
 
   height: 100%;
 }
 

+.height-auto {
+  height: auto !important;
+}
+

 .float {
   float: left;
   &.right {
 .float {
   float: left;
   &.right {


@@ -354,48 +362,45 @@ body.flexbox {
   grid-template-columns: 1fr 4fr 1fr;
   grid-template-areas: "a b c";
   grid-column-gap: $-xl;
   grid-template-columns: 1fr 4fr 1fr;
   grid-template-areas: "a b c";
   grid-column-gap: $-xl;

-  .tri-layout-right {
-    grid-area: c;
-    min-width: 0;
-  }
-  .tri-layout-left {
-    grid-area: a;
-    min-width: 0;
-  }
-  .tri-layout-middle {
-    grid-area: b;
-    padding-top: $-m;
-    min-width: 0;
-  }
+  position: relative;

 }
 }

-@include smaller-than($xxl) {
-  .tri-layout-container {
-    grid-template-areas:  "c b b"
-    "a b b"
-    ". b b";
-    grid-template-columns: 1fr 3fr;
-    grid-template-rows: min-content min-content 1fr;
-    padding-inline-end: $-l;
-  }
+.tri-layout-sides {
+  grid-column-start: a;
+  grid-column-end: c;
+  grid-row: 1;
+  min-width: 0;
+  z-index: 4;

 }
 }

-@include between($xxl, $xxxl) {
-  .tri-layout-container {
-    grid-template-columns: 1fr calc(940px + (2 * $-m)) 1fr;
-    grid-column-gap: $-s;
-    margin-inline-start: $-m;
-    margin-inline-end: $-m;
-  }
+.tri-layout-sides-content {
+  display: grid;
+  grid-template-areas: "a b c";
+  grid-template-columns: 1fr 4fr 1fr;
+  height: 100%;

 }
 }

-@include between($l, $xxl) {
-  .tri-layout-left {
-    position: sticky;
-    top: $-m;
-  }
-  .tri-layout-left-contents {
+.tri-layout-middle {
+  grid-area: b;
+  padding-top: $-m;
+  min-width: 0;
+  z-index: 5;
+}
+.tri-layout-right {
+  grid-area: c;
+  min-width: 0;
+}
+.tri-layout-left {
+  grid-area: a;
+  min-width: 0;
+}
+
+@include larger-than($xxl) {
+  .tri-layout-left-contents, .tri-layout-right-contents {
+    padding: $-xl $-m;

     position: sticky;
     top: 0;
     max-height: 100vh;
     position: sticky;
     top: 0;
     max-height: 100vh;

+    min-height: 50vh;

     overflow-y: scroll;
     overflow-y: scroll;

+    overflow-x: hidden;

     height: 100%;
     scrollbar-width: none;
     -ms-overflow-style: none;
     height: 100%;
     scrollbar-width: none;
     -ms-overflow-style: none;


@@ -403,10 +408,38 @@ body.flexbox {
       display: none;
     }
   }
       display: none;
     }
   }

+  .tri-layout-middle-contents {
+    max-width: 940px;
+    margin: 0 auto;
+  }

 }
 }

-@include larger-than($xxl) {
-  .tri-layout-left-contents, .tri-layout-right-contents {
-    padding: $-xl $-m;
+@include between($xxl, $xxxl) {
+  .tri-layout-sides-content, .tri-layout-container {
+    grid-template-columns: 1fr calc(940px + (2 * $-m)) 1fr;
+  }
+  .tri-layout-container {
+    grid-column-gap: $-s;
+    margin-inline-start: $-m;
+    margin-inline-end: $-m;
+  }
+}
+@include smaller-than($xxl) {
+  .tri-layout-container {
+    grid-template-areas:  "a b b";
+    grid-template-columns: 1fr 3fr;
+    grid-template-rows: min-content min-content 1fr;
+    padding-inline-end: $-l;
+  }
+  .tri-layout-sides {
+    grid-column-start: a;
+    grid-column-end: a;
+  }
+  .tri-layout-sides-content {
+    display: block;
+  }
+}
+@include between($l, $xxl) {
+  .tri-layout-sides-content {

     position: sticky;
     top: 0;
     max-height: 100vh;
     position: sticky;
     top: 0;
     max-height: 100vh;


@@ -420,12 +453,22 @@ body.flexbox {
       display: none;
     }
   }
       display: none;
     }
   }

-  .tri-layout-middle-contents {
-    max-width: 940px;
-    margin: 0 auto;
+}
+@include larger-than($l) {
+  .tri-layout-mobile-tabs {
+    display: none;
+  }
+  .tri-layout-left-contents > *, .tri-layout-right-contents > * {
+    @include lightDark(opacity, 0.6, 0.75);
+    transition: opacity ease-in-out 120ms;
+    &:hover, &:focus-within {
+      opacity: 1 !important;
+    }
+    @media (prefers-contrast: more) {
+      opacity: 1 !important;
+    }

   }
 }
   }
 }

-

 @include smaller-than($l) {
   .tri-layout-container {
     grid-template-areas:  none;
 @include smaller-than($l) {
   .tri-layout-container {
     grid-template-areas:  none;


@@ -433,18 +476,16 @@ body.flexbox {
     grid-column-gap: 0;
     padding-inline-end: $-xs;
     padding-inline-start: $-xs;
     grid-column-gap: 0;
     padding-inline-end: $-xs;
     padding-inline-start: $-xs;

-    .tri-layout-left-contents, .tri-layout-right-contents {
+    .tri-layout-sides {

       padding-inline-start: $-m;
       padding-inline-end: $-m;
       padding-inline-start: $-m;
       padding-inline-end: $-m;

+      grid-column: 1/1;

     }
     .tri-layout-left > *, .tri-layout-right > * {
       display: none;
       pointer-events: none;
     }
     .tri-layout-left, .tri-layout-right {
     }
     .tri-layout-left > *, .tri-layout-right > * {
       display: none;
       pointer-events: none;
     }
     .tri-layout-left, .tri-layout-right {

-      grid-area: none;
-      grid-column: 1/1;
-      grid-row: 1;

       padding-top: 0 !important;
     }
     .tri-layout-middle {
       padding-top: 0 !important;
     }
     .tri-layout-middle {


@@ -470,21 +511,6 @@ body.flexbox {
     }
   }
 }
     }
   }
 }

-@include larger-than($l) {
-  .tri-layout-mobile-tabs {
-    display: none;
-  }
-  .tri-layout-left-contents > *, .tri-layout-right-contents > * {
-    @include lightDark(opacity, 0.6, 0.75);
-    transition: opacity ease-in-out 120ms;
-    &:hover, &:focus-within {
-      opacity: 1 !important;
-    }
-    @media (prefers-contrast: more) {
-      opacity: 1 !important;
-    }
-  }
-}

 
 @include smaller-than($m) {
   .tri-layout-container {
 
 @include smaller-than($m) {
   .tri-layout-container {