diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js index fec09f5..aadba3f 100755 --- a/template/build/webpack.base.conf.js +++ b/template/build/webpack.base.conf.js @@ -29,7 +29,6 @@ module.exports = { 'src': path.resolve(__dirname, '../src'), 'assets': path.resolve(__dirname, '../src/assets'), 'components': path.resolve(__dirname, '../src/components'), - 'views': path.resolve(__dirname, '../src/views'), 'settings': path.resolve(__dirname, '../settings'), 'locales': path.resolve(__dirname, '../locales'), 'data': path.resolve(__dirname, '../src/data'), diff --git a/template/locales/index.js b/template/locales/index.js index 4dac834..662e8cd 100644 --- a/template/locales/index.js +++ b/template/locales/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' -import store from 'src/store' +import store from 'src/vuex/store' Vue.use(VueI18n) Vue.config.lang = store.state.lang diff --git a/template/package.json b/template/package.json index a39d6bb..a765dd6 100755 --- a/template/package.json +++ b/template/package.json @@ -40,8 +40,7 @@ "vue": "^2.0.0", "vue-i18n": "^4.5.0", "vue-router": "^2.0.0", - "vuex": "^2.0.0", - "vuex-router-sync": "^3.0.0" + "vuex": "^1.0.0-rc.2" }, "devDependencies": { "babel-core": "^6.0.0", diff --git a/template/src/App.vue b/template/src/App.vue index 6e8c4ad..55779e2 100644 --- a/template/src/App.vue +++ b/template/src/App.vue @@ -1,9 +1,9 @@ @@ -26,4 +26,3 @@ - diff --git a/template/src/assets/fonts/futura/FuturaBkBt.otf b/template/src/assets/fonts/futura/FuturaBkBt.otf new file mode 100755 index 0000000..329ffac Binary files /dev/null and b/template/src/assets/fonts/futura/FuturaBkBt.otf differ diff --git a/template/src/assets/fonts/futura/FuturaBkBt.ttf b/template/src/assets/fonts/futura/FuturaBkBt.ttf new file mode 100644 index 0000000..a6c7b3a Binary files /dev/null and b/template/src/assets/fonts/futura/FuturaBkBt.ttf differ diff --git a/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.eot b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.eot differ diff --git a/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.svg b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..8376c0f --- /dev/null +++ b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.ttf b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.ttf differ diff --git a/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff differ diff --git a/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff2 b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/template/src/assets/fonts/glyphicons/glyphicons-halflings-regular.woff2 differ diff --git a/template/src/assets/styles/app.scss b/template/src/assets/styles/app.scss index cd4c73a..055256c 100644 --- a/template/src/assets/styles/app.scss +++ b/template/src/assets/styles/app.scss @@ -25,7 +25,7 @@ body { color: $green; max-width: 250px; height: 400px; - font-family: 'Open Sans', Helvetica, sans-serif; + font-family: 'Futura', Helvetica, sans-serif; text-align: center; position: relative; diff --git a/template/src/assets/styles/fonts.scss b/template/src/assets/styles/fonts.scss index f207138..0be8c20 100644 --- a/template/src/assets/styles/fonts.scss +++ b/template/src/assets/styles/fonts.scss @@ -1,5 +1,15 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans'); +@font-face { + font-family: 'Futura'; + src: url('~assets/fonts/futura/FuturaBkBt.otf'); + src: url('~assets/fonts/futura/FuturaBkBt.ttf') format('truetype') +} @font-face { - font-family: 'Open Sans', sans-serif; + font-family: 'Glyphicons Halflings'; + src: url('~assets/fonts/glyphicons/glyphicons-halflings-regular.eot'); + src: url('~assets/fonts/glyphicons/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), + url('~assets/fonts/glyphicons/glyphicons-halflings-regular.woff2') format('woff2'), + url('~assets/fonts/glyphicons/glyphicons-halflings-regular.woff') format('woff'), + url('~assets/fonts/glyphicons/glyphicons-halflings-regular.ttf') format('truetype'), + url('~assets/fonts/glyphicons/glyphicons-halflings-regular.svg#@{icon-font-svg-id}') format('svg'); } diff --git a/template/src/views/Garden.vue b/template/src/components/Garden.vue similarity index 81% rename from template/src/views/Garden.vue rename to template/src/components/Garden.vue index d21549a..4485303 100644 --- a/template/src/views/Garden.vue +++ b/template/src/components/Garden.vue @@ -8,11 +8,13 @@