diff --git a/config_example.json b/config_example.json index fd70df9..0b3aced 100644 --- a/config_example.json +++ b/config_example.json @@ -16,6 +16,7 @@ ], "invite_secret": "YOUR_SECRET_HERE", "hide_comments_from_public": false, + "timezone": "UTC", "development": true }, "allowedModes": [ "sfw", "nsfw", "untagged", "all", "nsfl" ], diff --git a/public/s/css/f0ckm.css b/public/s/css/f0ckm.css index 6116d02..ebb9b4a 100644 --- a/public/s/css/f0ckm.css +++ b/public/s/css/f0ckm.css @@ -9636,13 +9636,6 @@ body.layout-legacy .navbar-header { overflow: visible; } - body.layout-modern>.pagewrapper>#main, - body.layout-modern>#main { - flex: 1; - display: flex; - flex-direction: column; - align-items: normal; - } body.layout-modern:has(.item-layout-container)>.pagewrapper>#main, body.layout-modern:has(.item-layout-container)>#main { @@ -9667,7 +9660,7 @@ body.layout-legacy .navbar-header { /* For generic pages in layout-modern, reset #main to plain block flow so children fill the full available width — mirrors layout-legacy exactly and prevents any flex child centering (e.g. margin:0 auto shrinking content like on /subscriptions). */ -body.layout-modern>.pagewrapper:not(:has(.index-layout-wrapper)):not(:has(.item-layout-container)):not(:has(.meme-layout-wrapper)):not(:has(.messages-convo-page))>#main { +body.layout-modern>.pagewrapper:not(:has(.index-layout-wrapper)):not(:has(.item-layout-container)):not(:has(.meme-layout-wrapper)):not(:has(.messages-convo-page))>#main:not(.session-grid) { display: block !important; width: 100%; } diff --git a/src/inc/config.mjs b/src/inc/config.mjs index 561ee54..17c4af5 100644 --- a/src/inc/config.mjs +++ b/src/inc/config.mjs @@ -16,6 +16,11 @@ if (process.env.NODE_ENV === 'production') { config.main.development = false; } +// Set timezone from config if not already set via environment variable +if (!process.env.TZ && config.main.timezone) { + process.env.TZ = config.main.timezone; +} + const base = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../"); const storage = process.env.STORAGE_DIR; diff --git a/views/admin/sessions.html b/views/admin/sessions.html index aeab908..ad4643c 100644 --- a/views/admin/sessions.html +++ b/views/admin/sessions.html @@ -36,11 +36,11 @@