diff --git a/package-lock.json b/package-lock.json index 161208af..0b9454ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "1.18.4", + "version": "1.18.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "1.18.4", + "version": "1.18.5", "license": "MIT", "dependencies": { "@louislam/sqlite3": "~15.0.6", diff --git a/server/client.js b/server/client.js index 795b3ad4..dcc778df 100644 --- a/server/client.js +++ b/server/client.js @@ -8,6 +8,7 @@ const server = UptimeKumaServer.getInstance(); const io = server.io; const { setting } = require("./util-server"); const checkVersion = require("./check-version"); +const dayjs = require("dayjs"); /** * Send list of notification providers to client @@ -124,6 +125,7 @@ async function sendInfo(socket) { latestVersion: checkVersion.latestVersion, primaryBaseURL: await setting("primaryBaseURL"), serverTimezone: await server.getTimezone(), + serverTimezoneOffset: dayjs().format("Z"), }); } diff --git a/src/assets/app.scss b/src/assets/app.scss index be324afd..7eb95931 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -101,6 +101,11 @@ optgroup { } } +// Override Bootstrap +.btn-group > .btn:hover { + z-index: initial; +} + .btn { padding-left: 20px; padding-right: 20px; diff --git a/src/pages/EditMaintenance.vue b/src/pages/EditMaintenance.vue index 790588d8..24229293 100644 --- a/src/pages/EditMaintenance.vue +++ b/src/pages/EditMaintenance.vue @@ -5,7 +5,7 @@