Merge remote-tracking branch 'refs/remotes/origin/master'

pull/1/head
farid saravi 5 years ago
commit bab46dc105

@ -1,7 +1,7 @@
{
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=a9b91ee3057962cbaa3b",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=5fc35fa922f55540736b",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=636ba5f2c7316a1d9f37",
"/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=e1f69f3ef11f9a3008b2",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=425bb0a5b3b37feaf6a7"
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=bd838299c7139fbdb561",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=d118d60bd7ce77638280",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=5a36e23c9b03ed5944b0",
"/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=028a37c865b0df2e3e12",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=45e54dcc60aa7e6f6749"
}

@ -1,15 +1,15 @@
import Vue from 'vue';
// import VueScrollReveal from "vue-scroll-reveal";
import VueScrollReveal from "vue-scroll-reveal";
import Vuetify from 'vuetify'
// import "popper.js";
// import "bootstrap-v4-rtl";
// import "bootstrap-v4-rtl/scss/bootstrap-rtl.scss";
// import "bootstrap-select";
// import "bootstrap-select/dist/css/bootstrap-select.css";
import "popper.js";
import "bootstrap-v4-rtl";
import "bootstrap-v4-rtl/scss/bootstrap-rtl.scss";
import "bootstrap-select";
import "bootstrap-select/dist/css/bootstrap-select.css";
import "vuetify/dist/vuetify.min.css"; // Ensure you are using css-loader
import "@Global/assets/Font-Icons/css/fontello.css";
import "@Global/scss/style.scss";
@ -22,13 +22,13 @@ import InfoBlock from "@Global/components/Misc/InfoBlock.vue";
import Breadcrumbs from "@Global/components/Misc/Breadcrumbs";
// Vue.use(VueScrollReveal, {
// class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
// duration: 800,
// scale: 1,
// distance: '10px',
// mobile: false
// });
Vue.use(VueScrollReveal, {
class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
duration: 800,
scale: 1,
distance: '10px',
mobile: false
});
Vue.use(Vuetify, {
iconfont: "fa",

Loading…
Cancel
Save