Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
karname-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Reza Sahebgharan
karname-ui
Commits
4e360c9a
Commit
4e360c9a
authored
Feb 26, 2020
by
Reza Sahebgharan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(fix conflict error for fonts): fix conflict error for fonts
parent
aca13b65
Pipeline
#1096
passed with stage
in 38 minutes and 15 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
.gitignore
.gitignore
+1
-1
vuetify.js
client/plugins/vuetify.js
+1
-1
webpack.config.js
landingpage/webpack.config.js
+1
-1
No files found.
.gitignore
View file @
4e360c9a
...
@@ -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/fonts
Directory
client/plugins/vuetify.js
View file @
4e360c9a
...
@@ -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'
;
...
...
landingpage/webpack.config.js
View file @
4e360c9a
...
@@ -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
:
'fonts
Directory
/'
}
}
}]
}]
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment