]> BookStack Code Mirror - bookstack/commitdiff
Fixed text overflow in various views
authorDan Brown <redacted>
Sun, 11 Feb 2018 14:28:26 +0000 (14:28 +0000)
committerDan Brown <redacted>
Sun, 11 Feb 2018 14:28:26 +0000 (14:28 +0000)
Fixes #669

resources/assets/sass/_lists.scss
resources/assets/sass/_text.scss
resources/views/books/grid-item.blade.php
resources/views/books/list-item.blade.php
resources/views/chapters/list-item.blade.php
resources/views/chapters/show.blade.php
resources/views/pages/list-item.blade.php

index 604334415495d6d123452bdb0da1468bac0f82bd..5f06e1da9d75aca3af5933b26db4498f4e54ed45 100644 (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;
index 7191265265d2830f6f17aa6fb03421aa473976cb..4309acc2165a2e970dc72ae947f32260f641b4bc 100644 (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
  */
index bb1914b908f9b3402b004cd2a6f0cd59d6b7f048..db99d0b5403bbbb39afc178b9b3dc07456788eac 100644 (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
index 92d0f9e2d1881b58fd28ac5888835fca88af87bd..a77ceee94eececb8f854d93af12b3830f4aea3c9 100644 (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>
\ No newline at end of file
index 9c1e2d640a874372251b611081ebf431809949c5..3b1f84258a0e7e440f1a2ed05fd9227ff5af80ae 100644 (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>
 
index 8f3b9143542c8413a37200f0123ca06a495e126e..8ad287bfcb7749ab3105630ecd552226173ca1f0 100644 (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">
index 593c2fc3c56398314abc5a229512593d117d6423..554e90e442bd0d5100dda3e1cf285f3dce4dd0c8 100644 (file)
                 <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>