]> BookStack Code Mirror - bookstack/commitdiff
Fixed some body card horizontal scroll and column collapse issues
authorDan Brown <redacted>
Mon, 27 May 2019 12:10:48 +0000 (13:10 +0100)
committerDan Brown <redacted>
Mon, 27 May 2019 12:10:48 +0000 (13:10 +0100)
As mentoined in #1441

resources/assets/sass/_blocks.scss
resources/assets/sass/_text.scss
resources/views/books/list.blade.php
resources/views/comments/comments.blade.php

index c43ff7f78c4f3c3b290bf40561e4e4eb06e6cfe0..032b1cbeb1c467983eaf8da8b1e02c5b0c38d0f2 100644 (file)
   margin-left: auto;
   margin-right: auto;
   margin-bottom: $-xl;
-  overflow: auto;
+  overflow: initial;
   min-height: 60vh;
   &.auto-height {
     min-height: 0;
 }
 @include smaller-than($s) {
   .content-wrap.card {
-    padding: $-m $-s;
+    padding: $-m $-m;
   }
 }
 
index 41c99bbe594eabde42ca80f97db763a201817cc8..1a613898e1e6b24613e3625c1dea73fac91dbc20 100644 (file)
@@ -291,15 +291,27 @@ li.checkbox-item, li.task-list-item {
 .text-center {
   text-align: center;
 }
-
 .text-left {
   text-align: left;
 }
-
 .text-right {
   text-align: right;
 }
 
+@each $sizeLetter, $size in $screen-sizes {
+  @include larger-than($size) {
+    .text-#{$sizeLetter}-center {
+      text-align: center;
+    }
+    .text-#{$sizeLetter}-left {
+      text-align: left;
+    }
+    .text-#{$sizeLetter}-right {
+      text-align: right;
+    }
+  }
+}
+
 .text-bigger {
   font-size: 1.1em;
 }
index 91a2c716e275bd1cefe9dd1bc6fd7a6b3c86191d..93d927ec7cf0a4f5e214dc0702e88d8a7686c2c7 100644 (file)
@@ -1,8 +1,8 @@
 
 <div class="content-wrap mt-m card">
-    <div class="grid half v-center">
+    <div class="grid half v-center no-row-gap">
         <h1 class="list-heading">{{ trans('entities.books') }}</h1>
-        <div class="text-right">
+        <div class="text-m-right my-m">
 
             @include('partials.sort', ['options' => $sortOptions, 'order' => $order, 'sort' => $sort, 'type' => 'books'])
 
index 4848977c9cd16c55a527c91354cc61c3c61c1fd0..cfc89340daf6aa738212b0034985dfaecb86a0d9 100644 (file)
@@ -1,8 +1,8 @@
 <div page-comments page-id="{{ $page->id }}" class="comments-list">
-    <div comment-count-bar class="grid half left-focus v-center">
+    <div comment-count-bar class="grid half left-focus v-center no-row-gap">
         <h5 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
         @if (count($page->comments) === 0)
-            <div class="text-right" comment-add-button-container>
+            <div class="text-m-right" comment-add-button-container>
                 <button type="button" action="addComment"
                         class="button outline">{{ trans('entities.comment_add') }}</button>
             </div>