Merge branch 'master' of github.com:nicolas-t/Chocolat

Conflicts: dist/js/jquery.chocolat.min.js
nicolas-t · Sep 15, 2015 · 07a8a2f · 07a8a2f
2 parents 3ade849 + 19d31ca
commit 07a8a2f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 23 deletions.
diff --git a/dist/css/chocolat.css b/dist/css/chocolat.css
@@ -1,13 +1,3 @@
-/*
-    CSS RESET
-*/
-
-html, body, div, span{
-    margin: 0;
-    padding: 0;
-    border: 0;
-    vertical-align: baseline;
-}
 .chocolat-zoomable.chocolat-zoomed .chocolat-img{
     cursor : zoom-out;
 }

diff --git a/dist/js/jquery.chocolat.js b/dist/js/jquery.chocolat.js
@@ -310,7 +310,7 @@
             ];
             var that = this;
             var def = $.when($(els).fadeOut(200)).done(function () {
-                that.elems.domContainer.removeClass(this._cssClasses.join(' '));
+                that.elems.domContainer.removeClass(that._cssClasses.join(' '));
             });
             this.settings.currentImage = false;
             this.settings.initialized = false;