From 6c202a59b0c480b07c5e659f65ee2f5526a16159 Mon Sep 17 00:00:00 2001 From: Connor Holloway Date: Sat, 18 Jun 2022 22:53:30 +0100 Subject: [PATCH 1/2] Make the fixed navbar optional Adds another on/off preference (default: on, keeps same behaviour) for the fixed navbar. When off the navbar will not remain at the top of the page when scrolling. This is useful for small displays such as phones where otherwise the navbar takes up a sizeable portion of the viewport. --- README.md | 1 + src/settings.rs | 3 ++- src/utils.rs | 12 ++++++++++++ static/style.css | 11 +++++++++-- templates/base.html | 6 ++++-- templates/settings.html | 5 +++++ 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48dea6b..277c829 100644 --- a/README.md +++ b/README.md @@ -272,6 +272,7 @@ Assign a default value for each setting by passing environment variables to Libr | `USE_HLS` | `["on", "off"]` | `off` | | `HIDE_HLS_NOTIFICATION` | `["on", "off"]` | `off` | | `AUTOPLAY_VIDEOS` | `["on", "off"]` | `off` | +| `FIXED_NAVBAR` | `["on", "off"]` | `on` | ### Examples diff --git a/src/settings.rs b/src/settings.rs index 9cdd266..aa6c231 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -19,7 +19,7 @@ struct SettingsTemplate { // CONSTANTS -const PREFS: [&str; 10] = [ +const PREFS: [&str; 11] = [ "theme", "front_page", "layout", @@ -30,6 +30,7 @@ const PREFS: [&str; 10] = [ "use_hls", "hide_hls_notification", "autoplay_videos", + "fixed_navbar", ]; // FUNCTIONS diff --git a/src/utils.rs b/src/utils.rs index 2691d16..0937cce 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -450,6 +450,7 @@ pub struct Preferences { pub hide_hls_notification: String, pub use_hls: String, pub autoplay_videos: String, + pub fixed_navbar: String, pub comment_sort: String, pub post_sort: String, pub subscriptions: Vec, @@ -481,6 +482,7 @@ impl Preferences { use_hls: setting(&req, "use_hls"), hide_hls_notification: setting(&req, "hide_hls_notification"), autoplay_videos: setting(&req, "autoplay_videos"), + fixed_navbar: setting_or_default(&req, "fixed_navbar", "on".to_string()), comment_sort: setting(&req, "comment_sort"), post_sort: setting(&req, "post_sort"), subscriptions: setting(&req, "subscriptions").split('+').map(String::from).filter(|s| !s.is_empty()).collect(), @@ -540,6 +542,16 @@ pub fn setting(req: &Request, name: &str) -> String { .to_string() } +// Retrieve the value of a setting by name or the default value +pub fn setting_or_default(req: &Request, name: &str, default: String) -> String { + let value = setting(req, name); + if !value.is_empty() { + value + } else { + default + } +} + // Detect and redirect in the event of a random subreddit pub async fn catch_random(sub: &str, additional: &str) -> Result, String> { if sub == "random" || sub == "randnsfw" { diff --git a/static/style.css b/static/style.css index 3e0d64d..e21a5c4 100644 --- a/static/style.css +++ b/static/style.css @@ -69,6 +69,9 @@ pre, form, fieldset, table, th, td, select, input { body { background: var(--background); font-size: 15px; +} + +body.fixed_navbar { padding-top: 60px; } @@ -88,8 +91,12 @@ nav { z-index: 2; top: 0; padding: 5px 15px; + margin-bottom: 10px; min-height: 40px; width: calc(100% - 30px); +} + +nav.fixed_navbar { position: fixed; } @@ -1237,7 +1244,7 @@ td, th { /* Mobile */ @media screen and (max-width: 800px) { - body { padding-top: 120px } + body.fixed_navbar { padding-top: 120px } main { flex-direction: column-reverse; @@ -1279,7 +1286,7 @@ td, th { } @media screen and (max-width: 480px) { - body { padding-top: 100px; } + body.fixed_navbar { padding-top: 100px; } #version { display: none; } .post { diff --git a/templates/base.html b/templates/base.html index f30aaaf..f9928ea 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,9 +25,11 @@ + {% if prefs.theme != "system" %} {{ prefs.theme }}{% endif %} + {% if prefs.fixed_navbar == "on" %} fixed_navbar{% endif %}"> -