Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ncoden committed Jun 24, 2018
2 parents 969f6c4 + ae564a2 commit 1e0d9e6
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 8 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

# 2.0.3 (23 June 2018)

This version makes Motion UI compatible with Meteor > 1.4.1 by allowing Meteor to use newer versions of the `fourseven:scss` dependency. Motion UI stays compatible with Meteor v1.2.1 and above.

## 📄 Changes
* 🐛 #125 - Revise Meteor `fourseven:scss` compatibility to support Meteor>1.4.1 support (@ncoden)

# 2.0.2 (13 June 2018)

This version fixes an issue introduced in `v2.0.1` preventing Meteor build and update Meteor installation documentation. It is fully compatible with `v2.0.1` and do not introduce any API change.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "motion-ui",
"version": "2.0.2",
"version": "2.0.3",
"authors": [
"ZURB <[email protected]>"
],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zurb/motion-ui",
"description": "Sass library for creating transitions and animations.",
"version": "2.0.2",
"version": "2.0.3",
"keywords": [
"css",
"sass",
Expand Down
7 changes: 5 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Package.describe({
name: 'zurb:motion-ui',
version: '2.0.2',
version: '2.0.3',
summary: 'Sass library for creating transitions and animations',
git: 'https://github.com/zurb/motion-ui.git',
documentation: 'meteor-README.md'
});

Package.onUse(function(api) {
api.versionsFrom('1.2.1');
api.imply('fourseven:[email protected]');
api.use(['ecmascript', 'jquery', 'fourseven:[email protected]'], 'client');
api.imply('fourseven:[email protected] || 4.0.0');
api.use(['ecmascript', 'jquery', 'fourseven:[email protected] || 4.0.0'], 'client');
api.addFiles('dist/motion-ui.js', 'client');
api.addFiles([
'src/_settings.scss',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "motion-ui",
"version": "2.0.2",
"version": "2.0.3",
"description": "Sass library for creating transitions and animations.",
"main": "dist/motion-ui.js",
"scripts": {
Expand Down

0 comments on commit 1e0d9e6

Please sign in to comment.