Permalink
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 7c0c303 + ea57e8c commit d67f9b15f24a3dec7302c4e76e50d3f8f7ce1a57 @desandro committed Apr 30, 2012
Showing with 5 additions and 6 deletions.
  1. +1 −1 _posts/docs/2011-05-02-options.mdown
  2. +2 −3 jquery.masonry.js
  3. +2 −2 jquery.masonry.min.js
@@ -76,7 +76,7 @@ $('#container').masonry({
## containerStyle
<dl class="clearfix">
- <dt><code>columnWidth</code></dt>
+ <dt><code>containerStyle</code></dt>
<dd class="option-type">Object</dd>
<dd class="default"><code>{ position: <span class="s1">'relative'</span> }</code></dd>
</dl>
View
@@ -1,5 +1,5 @@
/**
- * jQuery Masonry v2.1.04
+ * jQuery Masonry v2.1.05
* A dynamic layout plugin for jQuery
* The flip-side of CSS Floats
* http://masonry.desandro.com
@@ -243,8 +243,7 @@
colSpan, groupCount, groupY, groupColY, j;
//how many columns does this brick span
- colSpan = Math.ceil( $brick.outerWidth(true) /
- ( this.columnWidth + this.options.gutterWidth ) );
+ colSpan = Math.ceil( $brick.outerWidth(true) / this.columnWidth );
colSpan = Math.min( colSpan, this.cols );
if ( colSpan === 1 ) {
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit d67f9b1

Please sign in to comment.