Skip to content

Commit 440860b

Browse files
author
Pooya Parsa
committed
fix: import framework7 styles before user provided ones
1 parent 73e1c48 commit 440860b

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Diff for: lib/templates/App.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import Vue from 'vue'
22

3-
// Styles
4-
<% css.forEach(function (c) { %>import '<%= relativeToBuild(resolvePath(c.src || c)) %>'
5-
<% }) %>
3+
// Framework7 Styles
4+
<% if (options.css) { %>import './f7.styles.less'<% } %>
5+
<% if (options.f7IconsSrc) { %>import '<%= options.f7IconsSrc %>'<% } %>
6+
<% if (options.mdIconsSrc) { %>import '<%= options.mdIconsSrc %>'<% } %>
7+
8+
// User provided styles
9+
<%= css.map(c=> `import '${relativeToBuild(resolvePath(c.src || c))}'`) %>
610

711
// Default layout
812
import _default from '<%= layouts['default'] %>'

Diff for: lib/templates/framework7/f7.plugin.js

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ import Framework7Vue from 'framework7-vue'
44
import { routes } from './f7.router'
55
import Framework7VueComponents from './f7.components'
66

7-
// Framework7 Styles
8-
<% if (options.css) { %>import './f7.styles.less'<% } %>
9-
<% if (options.f7IconsSrc) { %>import '<%= options.f7IconsSrc %>'<% } %>
10-
<% if (options.mdIconsSrc) { %>import '<%= options.mdIconsSrc %>'<% } %>
11-
127
// Register F7 Vue Components
138
Vue.use(Framework7VueComponents)
149

0 commit comments

Comments
 (0)