From 220a7e89d5087af3989975cb326cd4d8f60cbc6a Mon Sep 17 00:00:00 2001 From: taehoon Date: Mon, 29 Apr 2019 14:37:08 -0400 Subject: [PATCH] use native scrollbar --- package.json | 1 - src/App.js | 9 +--- src/App.scss | 50 ------------------- src/App.vue | 2 +- .../user_reporting_modal.vue | 5 +- src/main.js | 2 - yarn.lock | 4 -- 7 files changed, 5 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 36dfda31fb..fcdea2c13f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "vue-router": "^3.0.1", "vue-template-compiler": "^2.3.4", "vue-timeago": "^3.1.2", - "vuebar": "^0.0.20", "vuelidate": "^0.7.4", "vuex": "^3.0.1", "whatwg-fetch": "^2.0.3" diff --git a/src/App.js b/src/App.js index 87f00989e2..e72c73e35c 100644 --- a/src/App.js +++ b/src/App.js @@ -39,14 +39,7 @@ export default { window.CSS.supports('-moz-mask-size', 'contain') || window.CSS.supports('-ms-mask-size', 'contain') || window.CSS.supports('-o-mask-size', 'contain') - ), - isMobile: navigator.userAgent.match(/Android/i) || - navigator.userAgent.match(/webOS/i) || - navigator.userAgent.match(/iPhone/i) || - navigator.userAgent.match(/iPad/i) || - navigator.userAgent.match(/iPod/i) || - navigator.userAgent.match(/BlackBerry/i) || - navigator.userAgent.match(/Windows Phone/i) + ) }), created () { // Load the locale from the storage diff --git a/src/App.scss b/src/App.scss index adbe949c86..921f2c3be1 100644 --- a/src/App.scss +++ b/src/App.scss @@ -795,53 +795,3 @@ nav { } } } - -// Vuebar default style -.vb > .vb-dragger { - z-index: 5; - width: 12px; - right: 0; -} - -.vb > .vb-dragger > .vb-dragger-styler { - backface-visibility: hidden; - transform: rotate3d(0,0,0,0); - background-color: $fallback--text; - background-color: var(--text, $fallback--text); - opacity: .1; - margin: 5px 5px 5px 0; - border-radius: 20px; - height: calc(100% - 10px); - display: block; -} - -.vb.vb-scrolling-phantom > .vb-dragger > .vb-dragger-styler { - opacity: .3; -} - -.vb > .vb-dragger:hover > .vb-dragger-styler { - opacity: .5; - margin: 0px; - height: 100%; -} - -.vb.vb-dragging > .vb-dragger > .vb-dragger-styler { - opacity: .5; - margin: 0px; - height: 100%; -} - -.vb.vb-dragging-phantom > .vb-dragger > .vb-dragger-styler { - opacity: .5; -} - -// Disable vuebar and use native scrollbar in mobile device -#app.mobile { - .vb-content { - width: 100% !important; - padding-right: 0 !important; - } - .vb-dragger { - display: none; - } -} diff --git a/src/App.vue b/src/App.vue index 229bf62b07..cb7e8d785e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@