Browse Source

Merge branch 'gh-pages', remote branch 'origin' into gh-pages

v1
David DeSandro 13 years ago
parent
commit
feac57bfe9
  1. 2
      _config.yml
  2. 11
      jquery.isotope.js
  3. 4
      jquery.isotope.min.js
  4. 16
      js/jquery-1.5.1.min.js
  5. 18
      js/jquery-1.6.1.min.js

2
_config.yml

@ -2,7 +2,7 @@ name: Isotope
permalink: /:categories/:title.html
pygments: true
isotope_js: jquery.isotope.min.js
jquery_js: js/jquery-1.5.1.min.js
jquery_js: js/jquery-1.6.1.min.js
exclude: [ Makefile ]
random_order: [ 11, 91, 63, 38, 4, 25, 94, 29, 60, 48, 32, 67, 33, 37, 39, 84, 40, 7, 96, 8, 97, 9, 14, 99, 15, 19, 5, 36, 114, 20, 30, 80, 13, 47, 21, 3, 22, 31, 54, 66, 55, 71, 1, 23, 41, 70, 2, 77, 117, 79, 42, 95, 46, 50, 69, 53, 56, 72, 51, 73, 59, 74, 35, 49, 101, 88, 34, 76, 102, 75, 103, 81, 58, 6, 82, 26, 27, 44, 83, 45, 86, 68, 87, 104, 105, 10, 85, 43, 12, 109, 110, 113, 28, 106, 107, 108, 115, 62, 116, 0, 57, 111, 112, 61, 89, 90, 64, 65, 92, 93, 78, 24, 98, 100, 16, 17, 18, 52 ]

11
jquery.isotope.js

@ -1,5 +1,5 @@
/**
* Isotope v1.3.110620
* Isotope v1.3.110623
* An exquisite jQuery plugin for magical layouts
* http://isotope.metafizzy.co
*
@ -762,16 +762,13 @@
var namespace = this.options.layoutMode,
measure = isRows ? 'rowHeight' : 'columnWidth',
size = isRows ? 'height' : 'width',
UCSize = isRows ? 'Height' : 'Width',
segmentsName = isRows ? 'rows' : 'cols',
containerSize = this.element[ size ](),
segments,
segmentSize;
// i.e. options.masonry && options.masonry.columnWidth
segmentSize = this.options[ namespace ] && this.options[ namespace ][ measure ] ||
// or use the size of the first item
this.$filteredAtoms[ 'outer' + UCSize ](true) ||
segmentSize = this.options[ namespace ] && this.options[ namespace ][ measure ] ||
// or use the size of the first item, i.e. outerWidth
this.$filteredAtoms[ 'outer' + capitalize(size) ](true) ||
// if there's no items, use size of container
containerSize;

4
jquery.isotope.min.js vendored

File diff suppressed because one or more lines are too long

16
js/jquery-1.5.1.min.js vendored

File diff suppressed because one or more lines are too long

18
js/jquery-1.6.1.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save