diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index 604334415..5f06e1da9 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -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; diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index 719126526..4309acc21 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -359,6 +359,11 @@ li.checkbox-item, li.task-list-item { color: inherit; } +.break-text { + white-space: pre-wrap; + word-wrap: break-word; +} + /** * Grouping */ diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php index bb1914b90..db99d0b54 100644 --- a/resources/views/books/grid-item.blade.php +++ b/resources/views/books/grid-item.blade.php @@ -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 diff --git a/resources/views/books/list-item.blade.php b/resources/views/books/list-item.blade.php index 92d0f9e2d..a77ceee94 100644 --- a/resources/views/books/list-item.blade.php +++ b/resources/views/books/list-item.blade.php @@ -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> \ No newline at end of file diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php index 9c1e2d640..3b1f84258 100644 --- a/resources/views/chapters/list-item.blade.php +++ b/resources/views/chapters/list-item.blade.php @@ -7,15 +7,15 @@ <span class="text-muted"> » </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> diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index 8f3b91435..8ad287bfc 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -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"> diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php index 593c2fc3c..554e90e44 100644 --- a/resources/views/pages/list-item.blade.php +++ b/resources/views/pages/list-item.blade.php @@ -12,14 +12,14 @@ <span class="text-muted"> » </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>