Permalink
Browse files

Merge branch 'master' of github.com:zurb/foundation

  • Loading branch information...
2 parents 7968c5d + 8c095b1 commit d0e1e394ef4b7899bb7a422ec66fe2a157d71440 @zurbchris zurbchris committed Nov 15, 2012
View
2 templates/project/scss/app.scss
@@ -1,4 +1,4 @@
-// You custom settings file to override Foundation defaults
+// Your custom settings file to override Foundation defaults
@import "settings";
// Comment out this import if you are customizing you imports below
View
2 vendor/assets/javascripts/foundation/jquery.foundation.orbit.js
@@ -292,6 +292,8 @@
});
if (reset) {
this.degrees = 0;
+ this.$rotator.removeClass('move');
+ this.$mask.removeClass('move');
}
if(this.degrees > 180) {
this.$rotator.addClass('move');

0 comments on commit d0e1e39

Please sign in to comment.