Skip to content

Commit

Permalink
Add .editorconfig file. Save all files again to be consistent.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vestride committed Aug 20, 2013
1 parent 3d41384 commit 790f025
Show file tree
Hide file tree
Showing 31 changed files with 43 additions and 33 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
@@ -0,0 +1,10 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
2 changes: 1 addition & 1 deletion _config_dev.yml
Expand Up @@ -3,4 +3,4 @@

environment: "development"
url: http://localhost:4000
baseurl: ""
baseurl: ""
2 changes: 1 addition & 1 deletion _includes/advanced-filters.html
Expand Up @@ -24,4 +24,4 @@ <h3>Searching</h3>
});
});</code></pre>

<p>For another example of advanced filters, check out the <a href="{{ site.baseurl }}{% post_url demos/2013-05-02-adaptive %}">compounded filters demo</a>.</p>
<p>For another example of advanced filters, check out the <a href="{{ site.baseurl }}{% post_url demos/2013-05-02-adaptive %}">compounded filters demo</a>.</p>
2 changes: 1 addition & 1 deletion _includes/changelog.html
Expand Up @@ -7,4 +7,4 @@ <h2>Changes</h2>
<li>9.18.12 - Added sorting ability and made plugin responsive. Updated to Modernizr 2.6.2</li>
<li>7.21.12 - Rewrote plugin in more object oriented structure. Added custom events. Updated to Modernizr 2.6.1</li>
<li>7.3.12 - Removed dependency on the css file and now apply the css with javascript</li>
</ul>
</ul>
2 changes: 1 addition & 1 deletion _includes/credit-jake.html
Expand Up @@ -2,4 +2,4 @@
<div class="container-fluid">
<p class="site-footer__credit">Photos and drawings by <a href="http://eightfoldstudios.com" target="_blank">Eightfold Studios</a>.</p>
</div>
</footer>
</footer>
2 changes: 1 addition & 1 deletion _includes/events.html
Expand Up @@ -24,4 +24,4 @@ <h3>Get notified when shuffle is done with setup</h3>
<h3>Do something when an item is removed</h3>
<pre rel="JavaScript"><code class="language-javascript">$grid.on('removed.shuffle', function( evt, $collection, shuffle ) {
console.log( this, evt, $collection, shuffle );
});</code></pre>
});</code></pre>
2 changes: 1 addition & 1 deletion _includes/features.html
Expand Up @@ -8,4 +8,4 @@ <h2>Features</h2>
<li>Items can have multiple groups and be different sizes</li>
<li>Sort items</li>
<li>Advanced filtering (like searching)</li>
</ul>
</ul>
2 changes: 1 addition & 1 deletion _includes/foot.html
@@ -1,2 +1,2 @@
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion _includes/head.html
Expand Up @@ -48,4 +48,4 @@
<script src="{{ site.baseurl }}/js/html5shiv.js"></script>
<![endif]-->
</head>
<body class="{{ page.bodyClass }}">
<body class="{{ page.bodyClass }}">
2 changes: 1 addition & 1 deletion _includes/nav.html
Expand Up @@ -43,4 +43,4 @@ <h3 class="site-nav__title">Demos</h3>
<button class="js-nav-toggle pull-right" data-close-label="Close Nav">Open Nav</button>
</div>
</div>
</nav>
</nav>
2 changes: 1 addition & 1 deletion _includes/picture-item.html
Expand Up @@ -14,4 +14,4 @@
<p class="picture-item__tags pull-right">{{ item.groups | join: ', ' }}</p>
</div>
{% if description %}{% if description == 'longDescription' %}{% assign description = site.longDescription %}{% endif %}<p class="picture-item__description">{{ description }}</p>{% endif %}
</figure>
</figure>
2 changes: 1 addition & 1 deletion _includes/scripts.html
Expand Up @@ -48,4 +48,4 @@

}(document, 'script'));
</script>
{% endif %}
{% endif %}
2 changes: 1 addition & 1 deletion _includes/sorting.html
Expand Up @@ -37,4 +37,4 @@ <h2>Sorting</h2>
});</code></pre>

<p>The <code class="language-javascript">opts</code> parameter can contain two properties. <code class="language-javascript">reverse</code>, a boolean which will reverse the array. <code class="language-javascript">by</code> is a function that is passed the element wrapped in jQuery. In the case above, we&rsquo;re returning the value of the data-date-created or data-title attributes.</p>
<p>Calling sort with an empty object will reset the elements to DOM order.</p>
<p>Calling sort with an empty object will reset the elements to DOM order.</p>
2 changes: 1 addition & 1 deletion _includes/usage.html
Expand Up @@ -57,4 +57,4 @@ <h3>A basic setup example</h3>
itemSelector: '.picture-item',
sizer: $sizer
});
});</code></pre>
});</code></pre>
2 changes: 1 addition & 1 deletion _layouts/default.html
Expand Up @@ -15,4 +15,4 @@ <h1>Shuffle</h1>
{{ content }}
</main>
{% include scripts.html %}
{% include foot.html %}
{% include foot.html %}
2 changes: 1 addition & 1 deletion _posts/demos/2013-05-01-basic.html
Expand Up @@ -31,4 +31,4 @@ <h2>Shuffle.js</h2>
</div>
</div>

{% include credit-jake.html %}
{% include credit-jake.html %}
2 changes: 1 addition & 1 deletion _posts/demos/2013-05-02-adaptive.html
Expand Up @@ -67,4 +67,4 @@ <h5 class="filter-group__label">Shapes</h5>
<h2>Shuffle.js</h2>
<p>{{ site.longDescription }}</p>
</div>
</section>
</section>
2 changes: 1 addition & 1 deletion _posts/demos/2013-06-19-adding-removing.html
Expand Up @@ -79,4 +79,4 @@ <h2>Shuffle.js</h2>
<p>{{ site.longDescription }}</p>
</div>
</div>
</section>
</section>
2 changes: 1 addition & 1 deletion _posts/demos/2013-06-26-mobile-grid.html
Expand Up @@ -49,4 +49,4 @@ <h2>Mobile Grid Demo</h2>
<article style="width:100%;text-align:center;">
100%
</article>
</div>
</div>
2 changes: 1 addition & 1 deletion _scss/_helpers.scss
Expand Up @@ -87,4 +87,4 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
}
2 changes: 1 addition & 1 deletion _scss/_mobile-grid.scss
Expand Up @@ -21,4 +21,4 @@ $columnWidth: (100 - ( $gutterWidth * ( $columns - 1 ))) / $columns;
}
}
}
}
}
2 changes: 1 addition & 1 deletion _scss/_normalize.scss
Expand Up @@ -388,4 +388,4 @@ textarea {
table {
border-collapse: collapse;
border-spacing: 0;
}
}
2 changes: 1 addition & 1 deletion _scss/_type.scss
Expand Up @@ -99,4 +99,4 @@ h4 {
color: white;
}
}
}
}
6 changes: 3 additions & 3 deletions css/prism.css
Expand Up @@ -13,11 +13,11 @@ pre[class*="language-"] {
text-align: left;
white-space: pre;
word-spacing: normal;

-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;

-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
Expand All @@ -35,7 +35,7 @@ pre[class*="language-"] {
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
overflow: auto;
}

:not(pre) > code[class*="language-"],
Expand Down
2 changes: 1 addition & 1 deletion jquery.shuffle.js
Expand Up @@ -1094,4 +1094,4 @@ $.fn.shuffle = function( opts ) {
});
};

})(jQuery, Modernizr);
})(jQuery, Modernizr);
2 changes: 1 addition & 1 deletion js/demos/adding-removing.js
Expand Up @@ -147,4 +147,4 @@ window.Manipulator = (function($) {

$(document).ready(function() {
new window.Manipulator( document.getElementById('my-shuffle') );
});
});
2 changes: 1 addition & 1 deletion js/demos/gallery.js
Expand Up @@ -169,4 +169,4 @@ Exports.Modules.Gallery = (function($, undefined) {

$(document).ready(function() {
Exports.Modules.Gallery.init();
});
});
2 changes: 1 addition & 1 deletion js/demos/homepage.js
Expand Up @@ -141,4 +141,4 @@ var DEMO = (function( $ ) {

$(document).ready(function() {
DEMO.init();
});
});
2 changes: 1 addition & 1 deletion js/demos/images-broken.js
Expand Up @@ -19,4 +19,4 @@ var ImageDemo = (function( $ ) {

$(document).ready(function() {
ImageDemo.init();
});
});
4 changes: 2 additions & 2 deletions js/demos/images.js
Expand Up @@ -5,7 +5,7 @@
// Another approach would be to initialize shuffle on document
// ready and as imagesLoaded reports back progress, call shuffle.layout()

// imagesLoade: https://github.com/desandro/imagesloaded
// imagesLoaded: https://github.com/desandro/imagesloaded

var ImageDemo = (function( $, imagesLoaded ) {

Expand Down Expand Up @@ -51,4 +51,4 @@ var ImageDemo = (function( $, imagesLoaded ) {

$(document).ready(function() {
ImageDemo.init();
});
});
2 changes: 1 addition & 1 deletion robots.txt
@@ -1,3 +1,3 @@
# robotstxt.org/

User-agent: *
User-agent: *

0 comments on commit 790f025

Please sign in to comment.