Commit 4e360c9a authored by Reza Sahebgharan's avatar Reza Sahebgharan

fix(fix conflict error for fonts): fix conflict error for fonts

parent aca13b65
Pipeline #1096 passed with stage
in 38 minutes and 15 seconds
...@@ -8,4 +8,4 @@ public/build.js ...@@ -8,4 +8,4 @@ public/build.js
public/favicon.ico public/favicon.ico
public/landing.html public/landing.html
public/index.html public/index.html
public/fonts public/fontsDirectory
...@@ -4,7 +4,7 @@ import '@mdi/font/css/materialdesignicons.css'; ...@@ -4,7 +4,7 @@ import '@mdi/font/css/materialdesignicons.css';
import 'material-design-icons-iconfont/dist/material-design-icons.css'; import 'material-design-icons-iconfont/dist/material-design-icons.css';
import Vue from 'vue'; import Vue from 'vue';
import Vuetify from 'vuetify'; import Vuetify from 'vuetify';
import './fonts/font.css'; import '../fonts/font.css';
Vue.use(Vuetify); Vue.use(Vuetify);
import fa from 'vuetify/es5/locale/fa'; import fa from 'vuetify/es5/locale/fa';
......
...@@ -98,7 +98,7 @@ module.exports = { ...@@ -98,7 +98,7 @@ module.exports = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[ext]', name: '[name].[ext]',
outputPath: 'fonts/' outputPath: 'fontsDirectory/'
} }
}] }]
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment