fix: fix some gui issues (#880)

mainsail-crew · Jun 11, 2022 · 76c04be · 76c04be
1 parent 0f279eb
commit 76c04be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -31,7 +31,6 @@
     <v-app dark :style="cssVars">
         <the-sidebar></the-sidebar>
         <the-topbar></the-topbar>
-
         <v-main id="content" :style="mainStyle">
             <overlay-scrollbars class="main-content-scrollbar">
                 <v-container id="page-container" fluid class="container px-3 px-sm-6 py-sm-6 mx-auto">

diff --git a/src/assets/styles/page.scss b/src/assets/styles/page.scss
@@ -1,5 +1,5 @@
 html {
-    overflow: auto;
+    overflow: hidden;
 }
 
 body {

diff --git a/src/main.ts b/src/main.ts
@@ -8,7 +8,7 @@ import vuetify from '@/plugins/vuetify'
 import i18n from '@/plugins/i18n'
 import store from '@/store'
 import router from '@/plugins/router'
-
+import { WebSocketPlugin } from '@/plugins/webSocketClient'
 import { registerSW } from 'virtual:pwa-register'
 
 // noinspection JSUnusedGlobalSymbols
@@ -33,7 +33,6 @@ Vue.component('VueLoadImage', VueLoadImage)
 //vue-toast-notifications
 import VueToast from 'vue-toast-notification'
 import 'vue-toast-notification/dist/theme-sugar.css'
-import { WebSocketPlugin } from '@/plugins/webSocketClient'
 
 Vue.use(VueToast, {
     duration: 3000,
@@ -43,11 +42,13 @@ Vue.use(VueToast, {
 import { OverlayScrollbarsPlugin } from 'overlayscrollbars-vue'
 import 'overlayscrollbars/css/OverlayScrollbars.css'
 
+const isSafari = navigator.userAgent.includes('Safari') && navigator.userAgent.search('Chrome') === -1
+const isTouch = 'ontouchstart' in window || (navigator.maxTouchPoints > 0 && navigator.maxTouchPoints !== 256)
 Vue.use(OverlayScrollbarsPlugin, {
     className: 'os-theme-light',
     scrollbars: {
         visibility: 'auto',
-        autoHide: 'move',
+        autoHide: isSafari && isTouch ? 'scroll' : 'move',
     },
 })
 

diff --git a/src/pages/Machine.vue b/src/pages/Machine.vue
@@ -9,10 +9,10 @@
                 <system-panel></system-panel>
                 <update-panel></update-panel>
                 <v-row>
-                    <v-col v-if="klipperState === 'ready'" class="col-md-6 pb-0 pb-md-3">
+                    <v-col v-if="klipperState === 'ready'" class="col-12 col-sm-6 pb-0 pb-md-3">
                         <endstop-panel></endstop-panel>
                     </v-col>
-                    <v-col :class="klipperState !== 'ready' ? 'col-md-12' : 'col-md-6 pl-0 pl-md-3'">
+                    <v-col :class="klipperState !== 'ready' ? 'col-12' : 'col-12 col-sm-6 pt-0 pt-sm-3'">
                         <logfiles-panel></logfiles-panel>
                     </v-col>
                 </v-row>