Permalink
Browse files

Fix indentation weirdness after rebasing in last merge

  • Loading branch information...
1 parent c40460b commit a183fa407d1a3004e99018e1cf2262850bd6ba10 @sindresorhus sindresorhus committed Jul 25, 2012
Showing with 18 additions and 18 deletions.
  1. +18 −18 index.html
View
@@ -3,12 +3,12 @@
<head>
<meta charset="utf-8">
<title>TodoMVC</title>
- <meta name="description" content="Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more">
+ <meta name="description" content="Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more">
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="twitter:card" content="summary">
- <meta property="og:url" content="http://todomvc.com">
- <meta property="og:title" content="TodoMVC">
- <meta property="og:description" content="Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more">
+ <meta name="twitter:card" content="summary">
+ <meta property="og:url" content="http://todomvc.com">
+ <meta property="og:title" content="TodoMVC">
+ <meta property="og:description" content="Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@@ -38,8 +38,8 @@
<p>Developers these days are spoiled with choice when it comes to selecting an <strong>MV* framework</strong> for structuring and organizing their JavaScript web apps.</p>
<p>Backbone, Ember, AngularJS, Spine... the list of new and stable solutions continues to grow, but just how do you decide on which to use in a sea of so many options?</p>
<p>To help solve this problem, we created <a href="https://github.com/addyosmani/todomvc">TodoMVC</a> - a project which offers the same Todo application implemented using MV* concepts in most of the popular JavaScript MV* frameworks of today.</p>
- <a href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-url="http://todomvc.com" data-text="TodoMVC - Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more"></a>
- <div class="g-plusone" data-size="medium" data-annotation="none" data-href="http://todomvc.com"></div>
+ <a href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-url="http://todomvc.com" data-text="TodoMVC - Helping you select an MV* framework - Todo apps for Backbone.js, Ember.js, AngularJS, Spine and many more"></a>
+ <div class="g-plusone" data-size="medium" data-annotation="none" data-href="http://todomvc.com"></div>
</div>
<div class="span8">
<h2>Our Stable Apps</h2>
@@ -105,7 +105,7 @@
</div>
<hr>
<div class="row">
- <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework apps in Labs</h2>
+ <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework apps in Labs</h2>
</div>
<hr>
<div class="row">
@@ -124,18 +124,18 @@ <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework
</div>
<hr>
<div class="row">
- <div class="span4">
+ <div class="span4">
<h2>What's new in 1.0</h2>
- <ul class="whats-new">
+ <ul class="whats-new">
<li>All main apps have been completely rewritten for consistency</li>
<li>Routing has been added to many of these</li>
- <li>We now have 30+ apps being worked on in Labs</li>
+ <li>We now have 30+ apps being worked on in Labs</li>
<li>We're using a kick-ass new template</li>
<li>Framework authors and contributors have been consulted to ensure our apps adhere to best practices</li>
<li>We're helping AMD users by adding AMD versions of many apps</li>
</ul>
</div>
- <div class="span4">
+ <div class="span4">
<h2>Selecting a Framework</h2>
<p>Once you've downloaded the latest release and played around with the apps, you'll want to decide on a specific framework to try out.</p>
<p>Study the syntax required for defining models, views and (where applicable) controllers and classes in the frameworks you're interested in and try your hand at editing the code to see how it feels using it first-hand.</p>
@@ -147,7 +147,7 @@ <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework
<p>If so, feel free to fork the repo, read our <a href="https://github.com/addyosmani/todomvc/wiki">contribution guidelines</a>, and submit a pull request &mdash; we'll be happy to review it for inclusion.</p>
<p>Make sure you use the <a href="https://github.com/addyosmani/todomvc/tree/master/template">template</a> as a starting point and read the <a href="https://github.com/addyosmani/todomvc/wiki/App-Specification">app specification</a>.</p>
<p>
- <a class="zocial small gray" href="https://github.com/addyosmani/todomvc/wiki">Submit Pull Request &raquo;</a>
+ <a class="zocial small gray" href="https://github.com/addyosmani/todomvc/wiki">Submit Pull Request &raquo;</a>
</p>
</div>
</div>
@@ -178,10 +178,10 @@ <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework
<a href="labs/architecture-examples/javascriptmvc/todo/todo/" data-source="http://javascriptmvc.com" data-content="JavaScriptMVC is an open-source framework containing the best ideas in jQuery development. It guides you to successfully completed projects by promoting best practices, maintainability, and convention over configuration.">JavaScriptMVC</a>
</li>
<li>
- <a href="labs/architecture-examples/stapes/" data-source="http://hay.github.com/stapes" data-content="Stapes is a (really) tiny Javascript MVC micro-framework (1.7kb) that has all the building blocks you need when writing an MVC app. It includes a powerful event system, support for inheritance, use with AMD, plugin support and more. A RequireJS Todo application is <a href='dependency-examples/stapes_require/index.html'>also</a> available.">Stapes</a>
- </li>
- <li>
- <a href="labs/architecture-examples/epitome/" data-source="http://dimitarchristoff.github.com/Epitome" data-content="Epitome is a new extensible and modular open-source MVP* framework, built out of MooTools Classes and Events.">Epitome</a>
+ <a href="labs/architecture-examples/stapes/" data-source="http://hay.github.com/stapes" data-content="Stapes is a (really) tiny Javascript MVC micro-framework (1.7kb) that has all the building blocks you need when writing an MVC app. It includes a powerful event system, support for inheritance, use with AMD, plugin support and more. A RequireJS Todo application is <a href='dependency-examples/stapes_require/index.html'>also</a> available.">Stapes</a>
+ </li>
+ <li>
+ <a href="labs/architecture-examples/epitome/" data-source="http://dimitarchristoff.github.com/Epitome" data-content="Epitome is a new extensible and modular open-source MVP* framework, built out of MooTools Classes and Events.">Epitome</a>
</li>
<li>
<a href="labs/architecture-examples/troopjs/" data-source="https://github.com/troopjs/" data-content="TroopJS attempts to package popular front-end technologies and bind them with minimal effort for the developer. It includes jQuery for DOM manipulation, ComposeJS for object composition, RequireJS for modularity and Has.js for feature detection. On top, it includes Pub/Sub support, templating, weaving (widgets to DOM) and auto-wiring.">TroopJS</a>
@@ -261,7 +261,7 @@ <h2 style="text-align:center;font-weight:300">Scroll down for 30+ more framework
<script src="site/js/bootstrap.min.js"></script>
<script src="site/js/main.js"></script>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
- <script>(function(){var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;po.src = 'https://apis.google.com/js/plusone.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);})();</script>
+ <script>(function(){var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;po.src = 'https://apis.google.com/js/plusone.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);})();</script>
<script>var _gaq=[['_setAccount','UA-31081062-1'],['_trackPageview']];(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script'));</script>
</body>
</html>

0 comments on commit a183fa4

Please sign in to comment.