diff options
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | src/App.js | 9 | ||||
| -rw-r--r-- | src/App.scss | 50 | ||||
| -rw-r--r-- | src/App.vue | 2 | ||||
| -rw-r--r-- | src/components/user_reporting_modal/user_reporting_modal.vue | 5 | ||||
| -rw-r--r-- | src/main.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 4 |
7 files changed, 5 insertions, 68 deletions
diff --git a/package.json b/package.json index 36dfda31..fcdea2c1 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" @@ -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 adbe949c..921f2c3b 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 229bf62b..cb7e8d78 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ <template> - <div id="app" v-bind:style="bgAppStyle" v-bind:class="{ mobile: isMobile }"> + <div id="app" v-bind:style="bgAppStyle"> <div class="app-bg-wrapper" v-bind:style="bgStyle"></div> <MobileNav v-if="isMobileLayout" /> <nav v-else class='nav-bar container' @click="scrollToTop()" id="nav"> diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue index 1cf25e8f..432dd14d 100644 --- a/src/components/user_reporting_modal/user_reporting_modal.vue +++ b/src/components/user_reporting_modal/user_reporting_modal.vue @@ -27,7 +27,7 @@ </div> </div> </div> - <div class="user-reporting-panel-right" v-bar="{preventParentScroll: true}"> + <div class="user-reporting-panel-right"> <List :items="statuses"> <template slot="item" slot-scope="{item}"> <div class="status-fadein user-reporting-panel-sitem"> @@ -113,12 +113,12 @@ &-right { display: flex; flex-direction: column; + overflow-y: auto; } &-sitem { display: flex; justify-content: space-between; - padding-right: 15px; > .status-el { flex: 1; @@ -150,6 +150,7 @@ &-right { width: 50%; flex: 1 1 auto; + margin-bottom: 12px; } } } diff --git a/src/main.js b/src/main.js index e01c921c..92f843b1 100644 --- a/src/main.js +++ b/src/main.js @@ -16,7 +16,6 @@ import reportsModule from './modules/reports.js' import VueTimeago from 'vue-timeago' import VueI18n from 'vue-i18n' -import Vuebar from 'vuebar' import createPersistedState from './lib/persisted_state.js' import pushNotifications from './lib/push_notifications_plugin.js' @@ -43,7 +42,6 @@ Vue.use(VueTimeago, { Vue.use(VueI18n) Vue.use(VueChatScroll) Vue.use(VueClickOutside) -Vue.use(Vuebar) const i18n = new VueI18n({ // By default, use the browser locale, we will update it if neccessary @@ -6491,10 +6491,6 @@ vue@^2.5.13: version "2.5.21" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85" -vuebar@^0.0.20: - version "0.0.20" - resolved "https://registry.yarnpkg.com/vuebar/-/vuebar-0.0.20.tgz#fd6313c2d3a2202c49e42419fe1d9ef126134200" - vuelidate@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.4.tgz#5a0e54be09ac0192f1aa3387d74b92e0945bf8aa" |