From 837d2bc58294dc50e36a5df09fb217f054dc461f Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 16 Mar 2019 16:00:41 +0000 Subject: [PATCH] Improved login, Fixed breadcrumbs & improved grid thumbnails --- resources/assets/sass/_buttons.scss | 3 --- resources/assets/sass/_forms.scss | 2 +- resources/assets/sass/_grid.scss | 11 +++++++++- resources/assets/sass/_lists.scss | 20 ++++++++++++++++--- .../views/auth/forms/login/standard.blade.php | 2 +- resources/views/auth/login.blade.php | 4 ++-- resources/views/auth/register.blade.php | 4 ++-- resources/views/books/grid-item.blade.php | 13 ++++++------ .../views/partials/breadcrumbs.blade.php | 2 +- resources/views/shelves/grid-item.blade.php | 6 ++++-- 10 files changed, 45 insertions(+), 22 deletions(-) diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss index 5e973a947..093da80ca 100644 --- a/resources/assets/sass/_buttons.scss +++ b/resources/assets/sass/_buttons.scss @@ -58,9 +58,6 @@ $button-border-radius: 2px; &.muted { @include generate-button-colors(#EEE, #AAA); } - &.muted-light { - @include generate-button-colors(#666, #e4e4e4); - } } .button + .button { diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 0b69c0d5b..77ac35963 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -197,7 +197,7 @@ input[type=date] { } } .setting-list-label { - color: #444; + color: #222; font-size: 1rem; } .setting-list-label + p.small { diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index 31ad84e1e..7415be73f 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -257,7 +257,7 @@ div[class^="col-"] img { margin: 0 0 10px; } p { - font-size: .85em; + font-size: .7rem; margin: 0; line-height: 1.6em; } @@ -293,6 +293,9 @@ div[class^="col-"] img { .grid.half, .grid.left-focus, .grid.right-focus { grid-template-columns: 1fr; } + .grid.half.collapse-xs { + grid-template-columns: 1fr 1fr; + } .grid.large-gap { grid-column-gap: $-m; grid-row-gap: $-m; @@ -311,6 +314,12 @@ div[class^="col-"] img { } } +@include smaller-than($xs) { + .grid.half.collapse-xs { + grid-template-columns: 1fr; + } +} + .float { float: left; &.right { diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index c6226f009..db057532d 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -462,6 +462,10 @@ ul.pagination { .featured-image-container { position: relative; overflow: hidden; + min-height: 140px; + background-size: cover; + background-position: 50% 50%; + transition: opacity ease-in-out 240ms; a { display: block; } @@ -470,11 +474,21 @@ ul.pagination { width: 100%; max-width: 100%; height: auto; - transition: all .5s ease-in-out; } } -.grid-card:hover .featured-image-container img { - transform: scale(1.15); +.featured-image-container-wrap { + position: relative; + .svg-icon { + color: #FFF; + fill: #FFF; + font-size: 2rem; + margin-right: 0; + position: absolute; + bottom: 10px; + left: 6px; + } +} +.grid-card:hover .featured-image-container { opacity: .5; } diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php index 557ee8339..a12fbd753 100644 --- a/resources/views/auth/forms/login/standard.blade.php +++ b/resources/views/auth/forms/login/standard.blade.php @@ -5,6 +5,6 @@
- @include('form.password', ['name' => 'password', 'tabindex' => 2]) + @include('form.password', ['name' => 'password', 'tabindex' => 1]) {{ trans('auth.forgot_password') }}
\ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 7ee710da5..f5d9e998f 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -16,7 +16,7 @@ @include('auth/forms/login/' . $authMethod) -
+
@include('components.custom-checkbox', [ 'name' => 'remember', @@ -36,7 +36,7 @@
@foreach($socialDrivers as $driver => $name)
- + @icon('auth/' . $driver) {{ trans('auth.log_in_with', ['socialDriver' => $name]) }} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index c997bcc19..1388472c2 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -26,7 +26,7 @@ @include('form/password', ['name' => 'password', 'placeholder' => trans('auth.password_hint')])
-
+
Already have an account?
@@ -42,7 +42,7 @@
@foreach($socialDrivers as $driver => $name)
- + @icon('auth/' . $driver) {{ trans('auth.sign_up_with', ['socialDriver' => $name]) }} diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php index fd576e7ed..e1d37753a 100644 --- a/resources/views/books/grid-item.blade.php +++ b/resources/views/books/grid-item.blade.php @@ -1,6 +1,8 @@ -
- {{$book->name}} +
+
cover) style="background-image: url('{{ $book->getBookCover() }}')"@endif> +
+ @icon('book')

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

@@ -10,9 +12,8 @@

{{ $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()]) }} +
+

@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/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php index 890a6783e..bf77a402a 100644 --- a/resources/views/partials/breadcrumbs.blade.php +++ b/resources/views/partials/breadcrumbs.blade.php @@ -2,7 +2,7 @@ {{--Show top level item--}} - @if (count($crumbs) > 0 && $crumbs[0] instanceof \BookStack\Entities\Book) + @if (count($crumbs) > 0 && array_first($crumbs) instanceof \BookStack\Entities\Book) @icon('books') {{ trans('entities.books') }} diff --git a/resources/views/shelves/grid-item.blade.php b/resources/views/shelves/grid-item.blade.php index c2d1b6127..25b35b9ef 100644 --- a/resources/views/shelves/grid-item.blade.php +++ b/resources/views/shelves/grid-item.blade.php @@ -1,7 +1,9 @@ -
- {{$shelf->name}} +
+
cover) style="background-image: url('{{ $shelf->getBookCover() }}')"@endif> +
+ @icon('bookshelf')

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