Skip to content

Commit

Permalink
fix(template): import f7 styles first to prevent overriding
Browse files Browse the repository at this point in the history
  • Loading branch information
Pooya Parsa committed Nov 9, 2017
1 parent 75c65eb commit b7ee0cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 5 additions & 0 deletions lib/templates/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import Vue from 'vue'

// Framework7 Styles
<% if (options.css) { %>import './framework7.less'<% } %>
<% if (options.f7IconsSrc) { %>import '<%= options.f7IconsSrc %>'<% } %>
<% if (options.mdIconsSrc) { %>import '<%= options.mdIconsSrc %>'<% } %>

// Styles
<% css.forEach(function (c) { %>import '<%= relativeToBuild(resolvePath(c.src || c)) %>'
<% }) %>
Expand Down
5 changes: 0 additions & 5 deletions lib/templates/f7-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ import { Framework7Vue } from 'framework7-vue'
import { routes } from './f7-router'
import Framework7VueComponents from './f7-components'

// Imports styles
<% if (options.css) { %>import './framework7.less'<% } %>
<% if (options.f7IconsSrc) { %>import '<%= options.f7IconsSrc %>'<% } %>
<% if (options.mdIconsSrc) { %>import '<%= options.mdIconsSrc %>'<% } %>

// Async import F7 core
const _Framework7 = import('framework7/dist/js/framework7.esm.bundle'/* webpackChunkName: f7 */).then(m => m.default)

Expand Down

0 comments on commit b7ee0cc

Please sign in to comment.