diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss index e01ecebc9..c51f01659 100644 --- a/resources/sass/_colors.scss +++ b/resources/sass/_colors.scss @@ -92,6 +92,6 @@ .bg-chapter { background-color: var(--color-chapter); } -.bg-shelf { +.bg-bookshelf { background-color: var(--color-bookshelf); } diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss index 4ada34725..4322cb5a6 100644 --- a/resources/sass/_text.scss +++ b/resources/sass/_text.scss @@ -352,12 +352,21 @@ li > ol, li > ul { overflow-wrap: break-word; } -.limit-text { +.text-limit-lines-1 { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.text-limit-lines-2 { + // -webkit use here is actually standardised cross-browser: + // https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-line-clamp + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} + /** * Grouping */ diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php deleted file mode 100644 index e1d37753a..000000000 --- a/resources/views/books/grid-item.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - -
-
cover) style="background-image: url('{{ $book->getBookCover() }}')"@endif> -
- @icon('book') -
-
-

{{$book->getShortName(35)}}

- @if(isset($book->searchSnippet)) -

{!! $book->searchSnippet !!}

- @else -

{{ $book->getExcerpt(130) }}

- @endif -
-
-

@icon('star'){{ trans('entities.meta_created', ['timeLength' => $book->created_at->diffForHumans()]) }}

-

@icon('edit'){{ trans('entities.meta_updated', ['timeLength' => $book->updated_at->diffForHumans()]) }}

-
- \ No newline at end of file diff --git a/resources/views/books/list.blade.php b/resources/views/books/list.blade.php index 42a2757f9..52cd935d1 100644 --- a/resources/views/books/list.blade.php +++ b/resources/views/books/list.blade.php @@ -1,4 +1,3 @@ -

{{ trans('entities.books') }}

@@ -22,7 +21,7 @@ @else
@foreach($books as $key => $book) - @include('books.grid-item', ['book' => $book]) + @include('partials.entity-grid-item', ['entity' => $book]) @endforeach
@endif diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 48c88434e..13125464a 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -49,7 +49,7 @@
@foreach($pageNav as $navItem)
  • - {{ $navItem['text'] }} + {{ $navItem['text'] }}
    • @endforeach diff --git a/resources/views/partials/entity-grid-item.blade.php b/resources/views/partials/entity-grid-item.blade.php new file mode 100644 index 000000000..ee31b53f2 --- /dev/null +++ b/resources/views/partials/entity-grid-item.blade.php @@ -0,0 +1,16 @@ + +
    +
    cover) style="background-image: url('{{ $entity->getBookCover() }}')"@endif> +
    + @icon($entity->getType()) +
    +
    +

    {{ $entity->name }}

    +

    {{ $entity->getExcerpt(130) }}

    +
    +
    +

    @icon('star'){{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}

    +

    @icon('edit'){{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}

    +
    +     \ No newline at end of file diff --git a/resources/views/shelves/grid-item.blade.php b/resources/views/shelves/grid-item.blade.php deleted file mode 100644 index 25b35b9ef..000000000 --- a/resources/views/shelves/grid-item.blade.php +++ /dev/null @@ -1,21 +0,0 @@ - -
    -
    cover) style="background-image: url('{{ $shelf->getBookCover() }}')"@endif> -
    - @icon('bookshelf') -
    -
    -

    {{$shelf->getShortName(35)}}

    - @if(isset($shelf->searchSnippet)) -

    {!! $shelf->searchSnippet !!}

    - @else -

    {{ $shelf->getExcerpt(130) }}

    - @endif -
    -
    - @icon('star'){{ trans('entities.meta_created', ['timeLength' => $shelf->created_at->diffForHumans()]) }} -
    - @icon('edit'){{ trans('entities.meta_updated', ['timeLength' => $shelf->updated_at->diffForHumans()]) }} -
    -     \ No newline at end of file diff --git a/resources/views/shelves/list-item.blade.php b/resources/views/shelves/list-item.blade.php index 6e5ed29a5..00cacfa70 100644 --- a/resources/views/shelves/list-item.blade.php +++ b/resources/views/shelves/list-item.blade.php @@ -1,5 +1,5 @@ -
    +
    @icon('bookshelf')
    diff --git a/resources/views/shelves/list.blade.php b/resources/views/shelves/list.blade.php index b20b08a2c..3600a8c79 100644 --- a/resources/views/shelves/list.blade.php +++ b/resources/views/shelves/list.blade.php @@ -21,7 +21,7 @@ @else
    @foreach($shelves as $key => $shelf) - @include('shelves.grid-item', ['shelf' => $shelf]) + @include('partials.entity-grid-item', ['entity' => $shelf]) @endforeach
    @endif diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php index 6fee6f45d..46432c1b9 100644 --- a/resources/views/shelves/show.blade.php +++ b/resources/views/shelves/show.blade.php @@ -22,7 +22,7 @@ @else
    @foreach($shelf->visibleBooks as $key => $book) - @include('books.grid-item', ['book' => $book]) + @include('partials.entity-grid-item', ['entity' => $book]) @endforeach
    @endif