diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php
index 1ebf80b..76670a6 100644
--- a/skolehjem/app/Http/Controllers/RootController.php
+++ b/skolehjem/app/Http/Controllers/RootController.php
@@ -15,18 +15,18 @@ class RootController extends Controller
}
public function index() {
- $perPage = 2;
+ $perPage = 5;
if(auth()->user()->can('admin.panel.show')) {
if(Response::detect("root.index")->name() == "admin.root.index")
return Response::detect("root.index");
else {
- $news = News::query()->orderBy('id', 'asc')->paginate($perPage);
+ $news = News::query()->orderBy('id', 'desc')->paginate($perPage);
return Response::detect("root.index", ["news" => $news]);
}
}
else {
- $news = News::query()->orderBy('id', 'asc')->paginate($perPage, ['*'], "page");
+ $news = News::query()->orderBy('id', 'desc')->paginate($perPage, ['*'], "page");
return view('app.root.index', ["news" => $news]);
}
diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php
index 85b458d..781a5e8 100644
--- a/skolehjem/app/Http/Controllers/WashingMachineController.php
+++ b/skolehjem/app/Http/Controllers/WashingMachineController.php
@@ -202,7 +202,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='
'.
- 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu | '.
+ 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu | '.
' | '.
' | '.
' | '.
@@ -228,7 +228,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='
'.
- 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu | '.
+ 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu | '.
' | '.
' | '.
' | '.
diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css
index 2caf886..4c76564 100644
--- a/skolehjem/public/css/webapp.css
+++ b/skolehjem/public/css/webapp.css
@@ -6675,11 +6675,7 @@ main {
header,
#menu {
- padding: 1.25rem 1.75rem 0 1.75rem;
- }
-
- #menu {
- padding-top: 4rem;
+ padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@@ -7068,7 +7064,6 @@ main {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
- overflow-x: hidden;
}
#snackbar.show {
diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css
index 1ea8777..05e4ec5 100644
--- a/skolehjem/public/css/webappdark.css
+++ b/skolehjem/public/css/webappdark.css
@@ -6675,11 +6675,7 @@ main {
header,
#menu {
- padding: 1.25rem 1.75rem 0 1.75rem;
- }
-
- #menu {
- padding-top: 4rem;
+ padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@@ -7068,7 +7064,6 @@ main {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
- overflow-x: hidden;
}
#snackbar.show {
diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js
index f73942f..33a50a8 100644
--- a/skolehjem/resources/js/navmenu/menu.js
+++ b/skolehjem/resources/js/navmenu/menu.js
@@ -9,7 +9,7 @@ function toggleMenu(menu) {
menuElement.classList.remove("hide");
mainElement.classList.remove("d-none");
htmlElement.style.backgroundColor = 'rgb(255, 255, 255)';
- logoElement.src = '/images/logos/Logo-normal.svg';
+ logoElement.src = '/images/logos/Logo-hvid.svg';
iconElement.classList.remove("fa-times");
iconElement.classList.add("fa-bars");
} else {
diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss
index f197552..efccd02 100644
--- a/skolehjem/resources/sass/webapp/_default.scss
+++ b/skolehjem/resources/sass/webapp/_default.scss
@@ -34,11 +34,7 @@ and (max-width : 900px)
}
header, #menu {
- padding: 1.25rem 1.75rem 0 1.75rem;
- }
-
- #menu {
- padding-top: 4rem;
+ padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@@ -527,7 +523,6 @@ $primary-color: $blue;
* {
word-break: break-word;
hyphens: auto;
- overflow-x: hidden;
}
#snackbar.show {
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 86c6d70..d5747c7 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -14,16 +14,16 @@
function setMain() {
var main = document.getElementsByTagName("main")[0];
var header = document.getElementsByTagName("header")[0];
- main.style.minHeight = 'calc(100% - ' + header.clientHeight + 'px)';
+ main.style.minHeight = 'calc(100% - ' + (header.clientHeight+10) + 'px)';
}
-