Permalink
Browse files

Merge branch 'module' of github.com:desandro/masonry into module

Conflicts:
	_posts/docs/2011-05-02-options.mdown
  • Loading branch information...
2 parents ea57e8c + 42b506e commit af3cbad17c66804c6338c4ec778d5f89ea865726 @desandro desandro committed Apr 30, 2012
Showing with 0 additions and 7,124 deletions.
  1. +0 −2 .gitignore
  2. +0 −3 .tm_properties
  3. +0 −6 _config.yml
  4. +0 −75 _layouts/default.html
  5. +0 −206 _posts/demos/2011-05-01-basic-single-column.html
  6. +0 −213 _posts/demos/2011-05-02-basic-multi-column.html
  7. +0 −57 _posts/demos/2011-05-03-images.html
  8. +0 −226 _posts/demos/2011-05-04-tumblelog.html
  9. +0 −144 _posts/demos/2011-05-05-animating-jquery.html
  10. +0 −132 _posts/demos/2011-05-06-animating-css-transitions.html
  11. +0 −136 _posts/demos/2011-05-07-animating-modernizr.html
  12. +0 −89 _posts/demos/2011-05-08-adding-items.html
  13. +0 −268 _posts/demos/2011-05-09-infinite-scroll.html
  14. +0 −209 _posts/demos/2011-05-10-gutters.html
  15. +0 −135 _posts/demos/2011-05-11-right-to-left.html
  16. +0 −137 _posts/demos/2011-05-17-centered.html
  17. +0 −219 _posts/demos/2011-07-26-fluid.html
  18. +0 −249 _posts/demos/2011-10-07-corner-stamp.html
  19. +0 −149 _posts/docs/2011-05-01-intro.mdown
  20. +0 −157 _posts/docs/2011-05-02-options.mdown
  21. +0 −155 _posts/docs/2011-05-03-methods.mdown
  22. +0 −93 _posts/docs/2011-05-04-animating.mdown
  23. +0 −139 _posts/docs/2011-05-30-help.mdown
  24. +0 −189 _posts/pages/2011-05-02-2.html
  25. +0 −174 _posts/pages/2011-05-03-3.html
  26. +0 −159 _posts/pages/2011-05-04-4.html
  27. +0 −167 _posts/pages/2011-05-05-5.html
  28. +0 −14 _posts/tests/2011-01-01-index.html
  29. +0 −1,438 _posts/tests/2011-05-14-lots-of-bricks.html
  30. +0 −247 _posts/tests/2011-05-17-dual.html
  31. +0 −217 _posts/tests/2011-05-18-first-child-no-width.html
  32. +0 −205 _posts/tests/2011-05-19-empty.html
  33. +0 −214 _posts/tests/2011-08-08-destroy.html
  34. +0 −50 _posts/tests/2011-09-27-centered-few.html
  35. +0 −612 css/style.css
  36. +0 −132 index.html
  37. +0 −38 js/box-maker.js
  38. +0 −4 js/jquery-1.7.1.min.js
  39. +0 −47 js/jquery.infinitescroll.min.js
  40. +0 −2 js/modernizr-transitions.js
  41. +0 −16 minify.sh
View
@@ -1,2 +0,0 @@
-_site/
-notes.mdown
View
@@ -1,3 +0,0 @@
-softTabs = true
-tabSize = 2
-excludeInFileChooser = "{$exclude,_site/*}"
View
@@ -1,6 +0,0 @@
-name: jQuery Masonry
-permalink: /:categories/:title.html
-pygments: true
-masonry_js: jquery.masonry.min.js
-jquery_js: js/jquery-1.7.1.min.js
-exclude: [ minify.sh, notes.mdown ]
View
@@ -1,75 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8" />
- {% if page.category != 'homepage' %}{% assign root_path = '../' %}{% assign link_path = '..' %}{% else %}{% assign link_path = '.' %}{% endif %}
- <title>{{ page.title }}{% if page.category != 'homepage' %} &middot; {{ site.name }}{% endif %}</title>
-
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
- <link rel="stylesheet" href="{{ root_path }}css/style.css" />
-
- {% if page.has_modernizr %}
- <script src="{{ root_path }}js/modernizr-transitions.js"></script>
- {% endif %}
- <!-- scripts at bottom of page -->
-
-</head>
-<body class="{{ page.category }} {{ page.body_class }}">
-
- <nav id="site-nav">
- <h1><a href="{{ root_path }}index.html">{{ site.name }}</a></h1>
-
- <h2>Docs</h2>
-
- <ul class="docs-list">
- {% for doc in site.categories.docs reversed %}
- {% if page.title == doc.title %}
- <li class="current"><a href="#content">{{ doc.title }}</a>
- <ul class="toc">
- {% for item in page.toc %}
- <li><a href="#{{ item.anchor }}">{{ item.title }}</a></li>
- {% endfor %}
- </ul>
- </li>
- {% else %}
- {% if doc.layout != 'index-page' %}
- <li><a href="{{ link_path }}{{ doc.url }}">{{ doc.title }}</a>
- {% endif %}
- {% endif %}
- {% endfor %}
- </ul>
-
- <h2>Demos</h2>
-
- <ul class="demos-list">
- {% for demo in site.categories.demos reversed %}
- {% if page.title == demo.title %}
- <li class="current"><a href="#content">{{ demo.title }}</a></li>
- {% else %}
- {% if demo.layout != 'index-page' %}
- <li><a href="{{ link_path }}{{ demo.url }}">{{ demo.title }}</a>
- {% endif %}
- {% endif %}
- {% endfor %}
- </ul>
-
- </nav> <!-- #site-nav -->
-
- <section id="content">
-
- {% if page.category != 'homepage' %}
- <h1>{{ page.title }}</h1>
- {% endif %}
-
- {{ content }}
-
- <footer id="site-footer">
- {{ site.name }} by <a href="http://desandro.com">David DeSandro</a>
- </footer>
-
- </section> <!-- #content -->
-
-</body>
-</html>
@@ -1,206 +0,0 @@
----
-
-title: Basic single-column
-category: demos
-layout: default
-
----
-
-<div id="copy">
-{% highlight javascript %}
-
-$('#container').masonry({
- itemSelector: '.box'
-});
-
-{% endhighlight %}
-</div>
-
-<div id="container" class="clearfix">
-
- <div class="box col1">
- <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.</p>
- </div>
-
- <div class="box col1">
- <p>Morbi purus libero, faucibus adipiscing, commodo quis, gravida id, est. Sed lectus. Praesent elementum hendrerit tortor. Sed semper lorem at felis.</p>
- <p>Sed ac risus. Phasellus lacinia, magna a ullamcorper laoreet, lectus arcu pulvinar risus, vitae facilisis libero dolor a purus. Sed vel lacus. Mauris nibh felis, adipiscing varius, adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus. Nunc tellus ante, mattis eget, gravida vitae, ultricies ac, leo. Integer leo pede, ornare a, lacinia eu, vulputate vel, nisl.</p>
- </div>
-
-
- <div class="box col1">
- <p>Donec nec justo eget felis facilisis fermentum. Aliquam porttitor mauris sit amet orci. </p>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- </div>
-
- <div class="box col1">
- <h2>Sit amet mi ullamcorper vehicula</h2>
- <p>Ut convallis, sem sit amet interdum consectetuer, odio augue aliquam leo, nec dapibus tortor nibh sed augue. Sed vel lacus. Mauris nibh felis, adipiscing varius, adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus. Nunc tellus ante, mattis eget, gravida vitae, ultricies ac, leo. Integer leo pede, ornare a, lacinia eu, vulputate vel, nisl.</p>
- </div>
-
- <div class="box col1">
- <p>adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus.</p>
- </div>
-
- <div class="box col1">
- <p>Sit amet mi ullamcorper vehicula</p>
- </div>
-
- <div class="box col1">
- <p>Phasellus pede arcu, dapibus eu, fermentum et, dapibus sed, urna.</p>
- </div>
-
- <div class="box col1">
- <p>Ut condimentum mi vel tellus. Suspendisse laoreet. Fusce ut est sed dolor gravida convallis. Morbi vitae ante. Vivamus ultrices luctus nunc. Suspendisse et dolor. </p>
- <p>Phasellus pede arcu, dapibus eu, fermentum et, dapibus sed, urna.</p>
- </div>
-
- <div class="box col1">
- <p>Sed ac risus. Phasellus lacinia, magna a ullamcorper laoreet, lectus arcu pulvinar risus, vitae facilisis libero dolor a purus. Sed vel lacus. </p>
- </div>
-
- <div class="box col1">
- <p>Morbi purus libero, faucibus adipiscing, commodo quis, gravida id, est. Sed lectus. Praesent elementum hendrerit tortor. Sed semper lorem at felis.</p>
- </div>
-
- <div class="box col1">
- <p>Vestibulum volutpat, lacus a ultrices sagittis,</p>
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- </div>
-
- <div class="box col1">
- <p>Sit amet mi ullamcorper vehicula</p>
- </div>
-
- <div class="box col1">
- <p>Morbi purus libero</p>
- </div>
-
- <div class="box col1">
- <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. </p>
- </div>
-
- <div class="box col1">
- <p>Vestibulum volutpat, lacus a ultrices sagittis,</p>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- </div>
-
- <div class="box col1">
- <p>Sit amet mi ullamcorper vehicula</p>
- </div>
-
- <div class="box col1">
- <h2>Morbi purus libero</h2>
- </div>
-
-
- <div class="box col1">
- <p>Ut condimentum mi vel tellus. Suspendisse laoreet. Fusce ut est sed dolor gravida convallis. Morbi vitae ante. Vivamus ultrices luctus nunc. Suspendisse et dolor. Etiam dignissim. Proin malesuada adipiscing lacus. Donec metus. Curabitur gravida.</p>
- <p>Phasellus pede arcu, dapibus eu, fermentum et, dapibus sed, urna.</p>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula</p>
- </div>
-
- <div class="box col1">
- <p>Sed ac risus. Phasellus lacinia, magna a ullamcorper laoreet, </p>
- </div>
-
-
- <div class="box col1">
- <p>adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus.</p>
- </div>
-
-
- <div>
- <div class="box col1">
- <p>Sit amet mi ullamcorper vehicula</p>
- <h2>Sit amet mi ullamcorper vehicula</h2>
- </div>
-
- <div class="box col1">
- <p>Phasellus pede arcu, dapibus eu, fermentum et, dapibus sed, urna.</p>
- </div>
-
- <div class="box col1">
- <h2>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </h2>
- </div>
-
- <div class="box col1">
- <p>Ut convallis, sem sit amet interdum consectetuer, odio augue aliquam leo, nec dapibus tortor nibh sed augue.</p>
- <p>Ut condimentum mi vel tellus. Suspendisse laoreet. Fusce ut est sed dolor gravida convallis. Morbi vitae ante. Vivamus ultrices luctus nunc. Suspendisse et dolor. Etiam dignissim. Proin malesuada adipiscing lacus. Donec metus. Curabitur gravida.</p>
- </div>
-
- <div class="box col1">
-
- <ul>
- <li>Lacus a ultrices sagittis</li>
- <li>Democratis</li>
- <li>Plummus</li>
- </ul>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- <p>Morbi interdum mollis sapien. Sed ac risus. Phasellus lacinia, magna a ullamcorper laoreet, lectus arcu pulvinar risus, vitae facilisis libero dolor a purus.</p>
- </div>
-
- <div class="box col1">
- <p>adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus.</p>
-
- </div>
- </div>
-
- <div class="box col1">
- <p>Phasellus pede arcu, dapibus eu, fermentum et, dapibus sed, urna.</p>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula</p>
- </div>
-
-
-
- <div class="box col1">
- <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.</p>
- </div>
-
- <div class="box col1">
- <p>Donec nec justo eget felis facilisis fermentum. Aliquam porttitor mauris sit amet orci. </p>
- </div>
-
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- </div>
-
- <div class="box col1">
- <p>Vestibulum volutpat, lacus a ultrices sagittis,</p>
- </div>
- <div class="box col1">
- <p>Fusce accumsan mollis eros. Pellentesque a diam sit amet mi ullamcorper vehicula </p>
- </div>
- <div class="box col1">
-
- <p>Morbi purus libero, faucibus adipiscing, commodo quis, gravida id, est. Sed lectus. Praesent elementum hendrerit tortor. Sed semper lorem at felis.</p>
- </div>
-
-</div> <!-- #container -->
-
-<script src="../{{ site.jquery_js }}"></script>
-<script src="../{{ site.masonry_js }}"></script>
-<script>
- $(function(){
-
- $('#container').masonry({
- itemSelector: '.box'
- });
-
- });
-</script>
Oops, something went wrong.

0 comments on commit af3cbad

Please sign in to comment.