From bdce223125590a6ddf059f48bb52a719666b044e Mon Sep 17 00:00:00 2001 From: danielbroll Date: Mon, 15 Aug 2022 14:23:43 +0200 Subject: [PATCH] Improve navigation bar --- .../lndmanagej/ui/page/general/ThymeleafPage.java | 2 ++ ui/src/main/resources/static/css/layout.css | 10 +--------- .../main/resources/templates/fragments/navigation.html | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java index 5fa7422d..13b712f4 100644 --- a/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java +++ b/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java @@ -7,6 +7,7 @@ import java.util.Map; public abstract class ThymeleafPage { + private static final String VIEW_KEY = "page"; private final Map modelAttributes = new HashMap<>(); public ThymeleafPage() { @@ -24,6 +25,7 @@ public abstract class ThymeleafPage { } public String create(Model model) { + model.addAttribute(VIEW_KEY, getView()); model.addAllAttributes(getModelAttributes()); return getView(); } diff --git a/ui/src/main/resources/static/css/layout.css b/ui/src/main/resources/static/css/layout.css index e1099fbb..6122eeab 100644 --- a/ui/src/main/resources/static/css/layout.css +++ b/ui/src/main/resources/static/css/layout.css @@ -13,16 +13,8 @@ body { */ .sidebar { - position: fixed; - top: 0; - /* rtl:raw: - right: 0; - */ - bottom: 0; - /* rtl:remove */ - left: 0; z-index: 100; /* Behind the navbar */ - padding: 48px 0 0; /* Height of navbar */ + padding: 12px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } diff --git a/ui/src/main/resources/templates/fragments/navigation.html b/ui/src/main/resources/templates/fragments/navigation.html index f528e9ce..923a19f3 100644 --- a/ui/src/main/resources/templates/fragments/navigation.html +++ b/ui/src/main/resources/templates/fragments/navigation.html @@ -3,7 +3,7 @@