From 6e563bd4b41d658612500ee225b0f4994d7c87ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julian=20=C4=86wirko?= Date: Mon, 29 Feb 2016 18:38:36 +0100 Subject: [PATCH] zf 6.2 - meteor package adjustments --- .npm/package/.gitignore | 1 - .npm/package/README | 7 ------- .npm/package/npm-shrinkwrap.json | 12 ------------ package.js | 16 ++++++++-------- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 .npm/package/.gitignore delete mode 100644 .npm/package/README delete mode 100644 .npm/package/npm-shrinkwrap.json diff --git a/.npm/package/.gitignore b/.npm/package/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/.npm/package/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/.npm/package/README b/.npm/package/README deleted file mode 100644 index 3d492553a..000000000 --- a/.npm/package/README +++ /dev/null @@ -1,7 +0,0 @@ -This directory and the files immediately inside it are automatically generated -when you change this package's NPM dependencies. Commit the files in this -directory (npm-shrinkwrap.json, .gitignore, and this README) to source control -so that others run the same versions of sub-dependencies. - -You should NOT check in the node_modules directory that Meteor automatically -creates; if you are using git, the .gitignore file tells git to ignore it. diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json deleted file mode 100644 index 49664cf22..000000000 --- a/.npm/package/npm-shrinkwrap.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "motion-ui": { - "version": "1.1.0", - "dependencies": { - "jquery": { - "version": "2.1.4" - } - } - } - } -} diff --git a/package.js b/package.js index 18f980b48..94f3e84e1 100644 --- a/package.js +++ b/package.js @@ -1,21 +1,15 @@ Package.describe({ name: 'zurb:foundation-sites', summary: 'Foundation 6 - The most advanced responsive front-end framework in the world.', - version: '6.2.0', + version: '6.2.0_1', git: 'https://github.com/zurb/foundation-sites.git', documentation: 'meteor-README.md' }); -Npm.depends({ - 'motion-ui': '1.1.0' -}); - Package.onUse(function(api) { api.versionsFrom('1.2.1'); api.imply('fourseven:scss@3.4.1'); api.use(['ecmascript', 'jquery', 'fourseven:scss@3.4.1'], 'client'); - api.addFiles('.npm/package/node_modules/motion-ui/dist/motion-ui.css', 'client'); - api.addFiles('.npm/package/node_modules/motion-ui/dist/motion-ui.js', 'client'); api.addFiles('dist/foundation.js', 'client'); api.addFiles([ @@ -35,9 +29,11 @@ Package.onUse(function(api) { 'scss/components/_dropdown-menu.scss', 'scss/components/_dropdown.scss', 'scss/components/_flex-video.scss', + 'scss/components/_flex.scss', 'scss/components/_float.scss', 'scss/components/_label.scss', 'scss/components/_media-object.scss', + 'scss/components/_menu-icon.scss', 'scss/components/_menu.scss', 'scss/components/_off-canvas.scss', 'scss/components/_orbit.scss', @@ -62,6 +58,9 @@ Package.onUse(function(api) { 'scss/forms/_help-text.scss', 'scss/forms/_input-group.scss', 'scss/forms/_label.scss', + 'scss/forms/_meter.scss', + 'scss/forms/_progress.scss', + 'scss/forms/_range.scss', 'scss/forms/_select.scss', 'scss/forms/_text.scss', @@ -83,11 +82,12 @@ Package.onUse(function(api) { 'scss/util/_breakpoint.scss', 'scss/util/_color.scss', + 'scss/util/_flex.scss', 'scss/util/_mixins.scss', 'scss/util/_selector.scss', 'scss/util/_unit.scss', 'scss/util/_util.scss', 'scss/util/_value.scss' - + ], 'client', {isImport: true}); }); -- 2.47.2