Skip to content
This repository has been archived by the owner on May 2, 2020. It is now read-only.

Commit

Permalink
closes #440 - Use npm for Framework7
Browse files Browse the repository at this point in the history
  • Loading branch information
scriptPilot authored and scriptPilot committed May 13, 2017
1 parent dbd2007 commit 8814816
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 47,326 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

- [x] [#520 - Preload all images before application start](https://github.com/scriptPilot/app-framework/issues/520)

### Improvements

- [x] [#440 - Use npm for Framework7](ttps://github.com/scriptPilot/app-framework/issues/440)

## Version 1.5.2

Released on 2017-05-13
Expand Down
2 changes: 1 addition & 1 deletion lib/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ function initF7VueApp () {
// Load Vue
let vue = require('vue/dist/vue.common.js')
// Load Framework7
require('../vendor/framework7/js/framework7.js')
require('framework7/dist/js/framework7.js')
// Load Framework7-Vue (with workaround for theme integration)
let config = require(process.env.APP_ROOT_FROM_SCRIPTS + 'config.json')
let theme = (/^(ios|material)$/.test(window.localStorage.theme) && config.theme.split('-').indexOf(window.localStorage.theme) >= 0)
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"firebase": "^3.6.6",
"firebase-tools": "^3.2.3",
"font-awesome": "^4.7.0",
"framework7": "^1.6.0",
"framework7-icons": "^0.8.0",
"fs-extra": "^2.0.0",
"ftp": "^0.3.10",
Expand Down
2 changes: 2 additions & 0 deletions scripts/f7-update.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ let fs = require('fs-extra')
let abs = require('path').resolve
let rec = require('recursive-readdir')

alert('Framework7 is used from npm, not from vendor folder anymore.\nTo use again an own build, update initF7VueApp function and remove this alert.', 'error')

// Check App Framework development mode
if (env.installed === true) {
alert('Framework7 update is only possible in App Framework development mode.', 'error')
Expand Down
3,232 changes: 0 additions & 3,232 deletions vendor/framework7/css/framework7.ios.colors.css

This file was deleted.

Loading

0 comments on commit 8814816

Please sign in to comment.