diff --git a/CHANGELOG.md b/CHANGELOG.md index 94d9a52d..bd354b71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ TBD - Add port constraint for all server creation & api ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/479)) - Clean up backup configs when deleting servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/480)) ### Tweaks -- Fix sidebar to not move when scrolling ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/475)) +- Fix sidebar to not move when scrolling ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/481)) ### Lang TBD

diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css index d50f0c15..2d97d90e 100644 --- a/app/frontend/static/assets/css/crafty.css +++ b/app/frontend/static/assets/css/crafty.css @@ -8,6 +8,26 @@ color: var(--base-text) } +nav.sidebar { + position: fixed; +} + + +@media (min-width: 992px) { + nav.sidebar { + position: fixed; + max-height: auto; + } + + .main-panel { + margin-left: 270px; + } + + .sidebar-icon-only .main-panel { + margin-left: 70px; + } +} + .sidebar>.nav>.nav-item:not(.nav-profile)>.nav-link:before { content: none; @@ -21,30 +41,6 @@ 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/static/assets/js/shared/misc.js b/app/frontend/static/assets/js/shared/misc.js index 37d8e31d..70b4cc1e 100755 --- a/app/frontend/static/assets/js/shared/misc.js +++ b/app/frontend/static/assets/js/shared/misc.js @@ -197,6 +197,12 @@ if ($("canvas").length) { !body.hasClass("sidebar-icon-only") ); } + if (vw >= 992 && vw < 1200) { + localStorage.setItem( + "crafty-sidebar-expanded", + !body.hasClass("sidebar-icon-only") + ); + } } }); diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index b9a77b87..ed4c5a74 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -55,43 +55,42 @@ - - -
-
-
- {% include main_menu.html %} + + + +
+ {% include main_menu.html %} +
@@ -107,6 +106,7 @@
+
diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html index f65c55e9..6f5da3d0 100644 --- a/app/frontend/templates/main_menu.html +++ b/app/frontend/templates/main_menu.html @@ -1,145 +1,141 @@ -
- - - +
\ No newline at end of file + + + \ No newline at end of file