github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 02:28:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some body card horizontal scroll and column collapse issues

Browse Source 
As mentoined in #1441
This commit is contained in:
Dan Brown 2019-05-27 13:10:48 +01:00
parent 5aa741cb60
commit a602cdf401
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/sass/_blocks.scss
View File

@ -181,7 +181,7 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
margin-bottom: $-xl; margin-bottom: $-xl;
overflow: auto; overflow: initial;
min-height: 60vh; min-height: 60vh;
&.auto-height { &.auto-height {
min-height: 0; min-height: 0;
@ -202,7 +202,7 @@
} }
@include smaller-than($s) { @include smaller-than($s) {
.content-wrap.card { .content-wrap.card {
padding: $-m $-s; padding: $-m $-m;
} }
} }

16
resources/assets/sass/_text.scss
View File

@ -291,15 +291,27 @@ li.checkbox-item, li.task-list-item {
.text-center { .text-center {
text-align: center; text-align: center;
} }
.text-left { .text-left {
text-align: left; text-align: left;
} }
.text-right { .text-right {
text-align: 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 { .text-bigger {
font-size: 1.1em; font-size: 1.1em;
} }

4
resources/views/books/list.blade.php
View File

@ -1,8 +1,8 @@
<div class="content-wrap mt-m card"> <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> <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']) @include('partials.sort', ['options' => $sortOptions, 'order' => $order, 'sort' => $sort, 'type' => 'books'])

4
resources/views/comments/comments.blade.php
View File

@ -1,8 +1,8 @@
<div page-comments page-id="{{ $page->id }}" class="comments-list"> <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> <h5 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
@if (count($page->comments) === 0) @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" <button type="button" action="addComment"
class="button outline">{{ trans('entities.comment_add') }}</button> class="button outline">{{ trans('entities.comment_add') }}</button>
</div> </div>