Merge branch '1.1.x'

This commit is contained in:
Antoine Nguyen
2014-07-02 21:49:52 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -15,7 +15,7 @@
id: bid,
click: $.proxy(this.destroy_box, this)
}).css({
position: "absolute"
position: "fixed"
});
return div;
@@ -101,4 +101,4 @@
top_position: 50
};
})(jQuery);
})(jQuery);
+1 -1
View File
@@ -130,4 +130,4 @@ TwocolsNav.prototype = {
}
};
TwocolsNav.prototype = $.extend({}, Listing.prototype, TwocolsNav.prototype);
TwocolsNav.prototype = $.extend({}, Listing.prototype, TwocolsNav.prototype);