diff --git a/package-lock.json b/package-lock.json index 24f4cca4..87342813 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "1.16.1", + "version": "1.17.0-beta.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "1.16.1", + "version": "1.17.0-beta.0", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "~1.2.36", diff --git a/server/model/monitor.js b/server/model/monitor.js index 7c269fe2..3e026fb6 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -283,7 +283,7 @@ class Monitor extends BeanModel { username: this.basic_auth_user, password: this.basic_auth_pass, domain: this.authDomain, - workstation: this.authWorkstation, + workstation: this.authWorkstation ? this.authWorkstation : undefined }); } else { diff --git a/src/assets/app.scss b/src/assets/app.scss index 5073302d..f5e07887 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -382,6 +382,12 @@ optgroup { overflow-y: auto; height: calc(100% - 65px); } + + @media (max-width: 770px) { + &.scrollbar { + height: calc(100% - 40px); + } + } .item { display: block; diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue index 7aeadd1e..c4e621f9 100644 --- a/src/components/MonitorList.vue +++ b/src/components/MonitorList.vue @@ -69,10 +69,22 @@ export default { }; }, computed: { + /** + * Improve the sticky appearance of the list by increasing its + * height as user scrolls down. + * Not used on mobile. + */ boxStyle() { - return { - height: `calc(100vh - 160px + ${this.windowTop}px)`, - }; + if (window.innerWidth > 550) { + return { + height: `calc(100vh - 160px + ${this.windowTop}px)`, + }; + } else { + return { + height: "calc(100vh - 160px)", + }; + } + }, sortedMonitorList() { diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index fb063da7..ab1ca623 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -404,7 +404,7 @@
- +
diff --git a/src/pages/List.vue b/src/pages/List.vue index 9cbf3f2f..dd2d4605 100644 --- a/src/pages/List.vue +++ b/src/pages/List.vue @@ -1,6 +1,6 @@ @@ -14,3 +14,11 @@ export default { }; + diff --git a/src/router.js b/src/router.js index 179dbe18..72619477 100644 --- a/src/router.js +++ b/src/router.js @@ -65,12 +65,12 @@ const routes = [ path: "/add", component: EditMonitor, }, - { - path: "/list", - component: List, - }, ], }, + { + path: "/list", + component: List, + }, { path: "/settings", component: Settings,