diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index 4f5f491..9e3aee2 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -31,7 +31,7 @@ class NewsController extends Controller */ public function index(Request $request) { - $news = News::query()->orderBy('id', 'asc')->paginate(2); + $news = News::query()->orderBy('id', 'asc')->paginate(20); return Response::detect("news.index", [ "news" => $news ]); } diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index f6f6283..1ebf80b 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -26,7 +26,7 @@ class RootController extends Controller } } else { - $news = News::query()->orderBy('id', 'asc')->paginate($perPage); + $news = News::query()->orderBy('id', 'asc')->paginate($perPage, ['*'], "page"); return view('app.root.index', ["news" => $news]); } diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index cc83d34..d2faecf 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -193,6 +193,10 @@ nav > .pagination { font-size: 24px; } +nav { + margin-top: auto; +} + .text-white { color: #ffffff; } diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index eb7351b..1ee81d2 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -193,6 +193,10 @@ nav > .pagination { font-size: 24px; } +nav { + margin-top: auto; +} + .text-white { color: #ffffff; } diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index 957eae4..45d2074 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -193,6 +193,10 @@ nav > .pagination { font-size: 24px; } +nav { + margin-top: auto; +} + .text-white { color: #ffffff; } diff --git a/skolehjem/resources/sass/app/general/_displays.scss b/skolehjem/resources/sass/app/general/_displays.scss index 4145325..3f9d892 100644 --- a/skolehjem/resources/sass/app/general/_displays.scss +++ b/skolehjem/resources/sass/app/general/_displays.scss @@ -64,3 +64,7 @@ nav > .pagination { .pagination > .page-item.disabled > .page-link { font-size: 24px; } + +nav { + margin-top: auto; +} diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 15ba688..2555057 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -22,7 +22,7 @@ margin-bottom: 1rem; } - +

Opret Aktivitet:

@csrf @@ -47,7 +47,7 @@
- + + + + + +