Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts: skolehjem/resources/views/app/news/index.blade.php
This commit is contained in:
commit
101be37dfe
|
@ -31,12 +31,12 @@ class RootController extends Controller
|
||||||
if(Response::detect("root.index")->name() == "admin.root.index")
|
if(Response::detect("root.index")->name() == "admin.root.index")
|
||||||
return view("admin.root.index");
|
return view("admin.root.index");
|
||||||
else {
|
else {
|
||||||
$news = News::query()->orderBy('id', 'desc')->get();
|
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
|
||||||
return view("app.root.index", ["news" => $news]);
|
return view("app.root.index", ["news" => $news]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$news = News::query()->orderBy('id', 'desc')->get();
|
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
|
||||||
|
|
||||||
return Response::detect('root.index', ["news" => $news]);
|
return Response::detect('root.index', ["news" => $news]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
margin-top: .5rem;
|
margin-top: .5rem;
|
||||||
margin-bottom: 7px;
|
margin-bottom: 7px;
|
||||||
width: auto;
|
width: auto;
|
||||||
heigt: auto;
|
|
||||||
@if(request()->cookie("mode") == "dark")
|
@if(request()->cookie("mode") == "dark")
|
||||||
background-color: rgba(0,0,0, 0.3);
|
background-color: rgba(0,0,0, 0.3);
|
||||||
@else
|
@else
|
||||||
|
|
Loading…
Reference in New Issue