github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 12:55:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed text overflow in various views

Browse Source 
Fixes #669
This commit is contained in:
Dan Brown 2018-02-11 14:28:26 +00:00
parent 548dcd4db1
commit 2d43ab8a1b
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/sass/_lists.scss
View File

@ -412,8 +412,6 @@ ul.pagination {
line-height: 1.2;
color: #009688;;
text-decoration: none;
white-space: pre-wrap; /* css-3 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
p {
font-size: .85em;

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

@ -359,6 +359,11 @@ li.checkbox-item, li.task-list-item {
color: inherit;
}
.break-text {
white-space: pre-wrap;
word-wrap: break-word;
}
/**
* Grouping
*/

2
resources/views/books/grid-item.blade.php
View File

@ -5,7 +5,7 @@
</a>
</div>
<div class="grid-card-content">
<h2><a href="{{$book->getUrl()}}" title="{{$book->name}}">{{$book->getShortName(35)}}</a></h2>
<h2><a class="break-text" href="{{$book->getUrl()}}" title="{{$book->name}}">{{$book->getShortName(35)}}</a></h2>
@if(isset($book->searchSnippet))
<p >{!! $book->searchSnippet !!}</p>
@else

6
resources/views/books/list-item.blade.php
View File

@ -1,10 +1,10 @@
<div class="book entity-list-item" data-entity-type="book" data-entity-id="{{$book->id}}">
<h4 class="text-book"><a class="text-book entity-list-item-link" href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i><span class="entity-list-item-name">{{$book->name}}</span></a></h4>
<h4 class="text-book"><a class="text-book entity-list-item-link" href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i><span class="entity-list-item-name break-text">{{$book->name}}</span></a></h4>
<div class="entity-item-snippet">
@if(isset($book->searchSnippet))
<p class="text-muted">{!! $book->searchSnippet !!}</p>
<p class="text-muted break-text">{!! $book->searchSnippet !!}</p>
@else
<p class="text-muted">{{ $book->getExcerpt() }}</p>
<p class="text-muted break-text">{{ $book->getExcerpt() }}</p>
@endif
</div>
</div>

6
resources/views/chapters/list-item.blade.php
View File

@ -7,15 +7,15 @@
<span class="text-muted">&nbsp;&nbsp;&raquo;&nbsp;&nbsp;</span>
@endif
<a href="{{ $chapter->getUrl() }}" class="text-chapter entity-list-item-link">
<i class="zmdi zmdi-collection-bookmark"></i><span class="entity-list-item-name">{{ $chapter->name }}</span>
<i class="zmdi zmdi-collection-bookmark"></i><span class="entity-list-item-name break-text">{{ $chapter->name }}</span>
</a>
</h4>
<div class="entity-item-snippet">
@if(isset($chapter->searchSnippet))
<p class="text-muted">{!! $chapter->searchSnippet !!}</p>
<p class="text-muted break-text">{!! $chapter->searchSnippet !!}</p>
@else
<p class="text-muted">{{ $chapter->getExcerpt() }}</p>
<p class="text-muted break-text">{{ $chapter->getExcerpt() }}</p>
@endif
</div>

2
resources/views/chapters/show.blade.php
View File

@ -99,7 +99,7 @@
<div class="container small">
<h1 v-pre>{{ $chapter->name }}</h1>
<div class="chapter-content" v-show="!searching">
<p v-pre class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
<p v-pre class="text-muted break-text">{!! nl2br(e($chapter->description)) !!}</p>
@if(count($pages) > 0)
<div v-pre class="page-list">

6
resources/views/pages/list-item.blade.php
View File

@ -12,14 +12,14 @@
<span class="text-muted">&nbsp;&nbsp;&raquo;&nbsp;&nbsp;</span>
@endif
@endif
<a href="{{ $page->getUrl() }}" class="text-page entity-list-item-link"><i class="zmdi zmdi-file-text"></i><span class="entity-list-item-name">{{ $page->name }}</span></a>
<a href="{{ $page->getUrl() }}" class="text-page entity-list-item-link"><i class="zmdi zmdi-file-text"></i><span class="entity-list-item-name break-text">{{ $page->name }}</span></a>
</h4>
<div class="entity-item-snippet">
@if(isset($page->searchSnippet))
<p class="text-muted">{!! $page->searchSnippet !!}</p>
<p class="text-muted break-text">{!! $page->searchSnippet !!}</p>
@else
<p class="text-muted">{{ $page->getExcerpt() }}</p>
<p class="text-muted break-text">{{ $page->getExcerpt() }}</p>
@endif
</div>