Skip to content

Commit 9b4f1fb

Browse files
committed
Styles: Aligned empty state alignment & consistency
- Fixed inital empty state margins/paddings to be aligned and not differ when lists are empty. - Aligned button/action display when viewing empty entities. - Fixed use of non-existing permission in books for book empty state button. Fixes #4563
1 parent d42af4a commit 9b4f1fb

File tree

9 files changed

+30
-15
lines changed

9 files changed

+30
-15
lines changed

resources/sass/_blocks.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
border-radius: 3px;
99
break-inside: avoid;
1010
.body, p.empty-text {
11-
padding: $-m;
11+
padding-block: $-m;
1212
}
1313
a, p {
1414
word-wrap: break-word;

resources/sass/_lists.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ details.sort-box[open] summary .caret-container svg {
342342
font-size: 0.9em;
343343
}
344344
.card .activity-list-item {
345-
padding: $-s $-m;
345+
padding-block: $-s;
346346
}
347347

348348
.user-list-item {

resources/views/books/index.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@if(count($popular) > 0)
1818
@include('entities.list', ['entities' => $popular, 'style' => 'compact'])
1919
@else
20-
<div class="body text-muted">{{ trans('entities.books_popular_empty') }}</div>
20+
<p class="text-muted pb-l mb-none">{{ trans('entities.books_popular_empty') }}</p>
2121
@endif
2222
</div>
2323

@@ -26,7 +26,7 @@
2626
@if(count($popular) > 0)
2727
@include('entities.list', ['entities' => $new, 'style' => 'compact'])
2828
@else
29-
<div class="body text-muted">{{ trans('entities.books_new_empty') }}</div>
29+
<p class="text-muted pb-l mb-none">{{ trans('entities.books_new_empty') }}</p>
3030
@endif
3131
</div>
3232
@stop
@@ -36,7 +36,7 @@
3636
<div class="actions mb-xl">
3737
<h5>{{ trans('common.actions') }}</h5>
3838
<div class="icon-list text-link">
39-
@if(user()->can('book-create-all'))
39+
@if(userCan('book-create-all'))
4040
<a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item">
4141
<span>@icon('add')</span>
4242
<span>{{ trans('entities.books_create') }}</span>

resources/views/books/parts/list.blade.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@
2424
</div>
2525
@else
2626
<p class="text-muted">{{ trans('entities.books_empty') }}</p>
27-
@if(userCan('books-create-all'))
28-
<a href="{{ url("/create-book") }}" class="text-pos">@icon('edit'){{ trans('entities.create_now') }}</a>
27+
@if(userCan('book-create-all'))
28+
<div class="icon-list block inline">
29+
<a href="{{ url("/create-book") }}"
30+
class="icon-list-item text-book">
31+
<span>@icon('add')</span>
32+
<span>{{ trans('entities.create_now') }}</span>
33+
</a>
34+
</div>
2935
@endif
3036
@endif
3137
</main>

resources/views/common/activity-list.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
@endforeach
99
</div>
1010
@else
11-
<p class="text-muted empty-text">{{ trans('common.no_activity') }}</p>
11+
<p class="text-muted empty-text mb-none pb-l">{{ trans('common.no_activity') }}</p>
1212
@endif

resources/views/entities/list.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@endforeach
66
</div>
77
@else
8-
<p class="text-muted empty-text">
8+
<p class="text-muted empty-text pb-l mb-none">
99
{{ $emptyText ?? trans('common.no_items') }}
1010
</p>
1111
@endif

resources/views/home/default.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,18 @@
6060
'emptyText' => trans('entities.no_pages_recently_updated'),
6161
])
6262
</div>
63-
<a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
63+
@if(count($recentlyUpdatedPages) > 0)
64+
<a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
65+
@endif
6466
</div>
6567
</div>
6668

6769
<div>
6870
<div id="recent-activity" class="card mb-xl">
6971
<h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
70-
@include('common.activity-list', ['activity' => $activity])
72+
<div class="px-m">
73+
@include('common.activity-list', ['activity' => $activity])
74+
</div>
7175
</div>
7276
</div>
7377

resources/views/shelves/index.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
@if(count($popular) > 0)
4141
@include('entities.list', ['entities' => $popular, 'style' => 'compact'])
4242
@else
43-
<div class="text-muted">{{ trans('entities.shelves_popular_empty') }}</div>
43+
<p class="text-muted pb-l mb-none">{{ trans('entities.shelves_popular_empty') }}</p>
4444
@endif
4545
</div>
4646

@@ -49,7 +49,7 @@
4949
@if(count($new) > 0)
5050
@include('entities.list', ['entities' => $new, 'style' => 'compact'])
5151
@else
52-
<div class="text-muted">{{ trans('entities.shelves_new_empty') }}</div>
52+
<p class="text-muted pb-l mb-none">{{ trans('entities.shelves_new_empty') }}</p>
5353
@endif
5454
</div>
5555
@stop

resources/views/shelves/parts/list.blade.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@
3030
@else
3131
<p class="text-muted">{{ trans('entities.shelves_empty') }}</p>
3232
@if(userCan('bookshelf-create-all'))
33-
<a href="{{ url("/create-shelf") }}"
34-
class="button outline">@icon('edit'){{ trans('entities.create_now') }}</a>
33+
<div class="icon-list block inline">
34+
<a href="{{ url("/create-shelf") }}"
35+
class="icon-list-item text-bookshelf">
36+
<span>@icon('add')</span>
37+
<span>{{ trans('entities.create_now') }}</span>
38+
</a>
39+
</div>
3540
@endif
3641
@endif
3742

0 commit comments

Comments
 (0)