From 99693324dccb06fc862590568bb7fabacdbb775f Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Mon, 3 Oct 2022 18:48:49 +0200 Subject: [PATCH 1/2] Fix scrolling of sidebar --- app/frontend/static/assets/css/crafty.css | 24 +++++ app/frontend/templates/base.html | 119 +++++++++++----------- app/frontend/templates/main_menu.html | 7 +- 3 files changed, 88 insertions(+), 62 deletions(-) diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css index a04d2542..d50f0c15 100644 --- a/app/frontend/static/assets/css/crafty.css +++ b/app/frontend/static/assets/css/crafty.css @@ -21,6 +21,30 @@ display: block; } +.sticky-sidebar { + position: fixed; + max-height: fit-content; + width: (100% - 270px); + z-index: 100; +} + +.main-panel { + margin-left: 70px; + margin-top: 63px; +} + +@media (min-width: 1200px) { + .main-panel { + margin-left: 270px; + } +} + +@media (max-width: 991px) { + .main-panel { + margin-left: 0px; + } +} + .toggle-handle { background-color: white !important; } diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 786037fa..b9a77b87 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -15,7 +15,7 @@ + href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> @@ -41,73 +41,74 @@ + integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA==" + crossorigin="anonymous" referrerpolicy="no-referrer"> + integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" + crossorigin="anonymous" referrerpolicy="no-referrer"> + integrity="sha512-klQv6lz2YR+MecyFYMFRuU2eAl8IPRo6zHnsc9n142TJuJHS8CG0ix4Oq9na9ceeg1u5EkBfZsFcV3U7J51iew==" + crossorigin="anonymous" referrerpolicy="no-referrer"> -
- - - - {% include main_menu.html %} - -
- -
- -
- - {% block content %} - {% end %} - - {% include footer.html %} - + + + +
+
+
+ {% include main_menu.html %} +
+
+ +
+ +
+ + {% block content %} + {% end %} + + {% include footer.html %} + +
+ +
+
@@ -173,7 +174,7 @@ + src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"> diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html index be21d152..f65c55e9 100644 --- a/app/frontend/templates/main_menu.html +++ b/app/frontend/templates/main_menu.html @@ -1,5 +1,5 @@ -
+