Permalink
Browse files

fixed conflicts

  • Loading branch information...
sintaxi committed Jan 12, 2011
2 parents 4ffafb2 + 7323dc8 commit a562a5b5ad33b21b70b4165c44b574f2e7b22739
Showing with 21 additions and 15 deletions.
  1. +1 −0 public/app.css
  2. +1 −1 public/app.min.css
  3. +18 −13 views/index.html.ejs
  4. +1 −1 views/layout.ejs
View
@@ -7,6 +7,7 @@ body {
background-image:-webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#ECE9E9));
background-image:-moz-linear-gradient(center top, white 0%, #ECE9E9 100%);
font-family:Georgia, serif;
+ padding-bottom:50px;
text-transform:lowercase;
}
View

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

Oops, something went wrong.
View
@@ -2,53 +2,58 @@
<h1>about</h1>
</div>
-<div class="grid_10">
- <p>A super micro tiny DOM framework for authoring mobile web applications. Proven across thousands of apps in stores and on the open web. Everything you need to author a mobile web applications and <em>nothing you don't</em>. XUI is the minimum framework you need to build a modern HTML5 mobile web application that gracefully degrades to older devices. And because the footprint is so small that means faster loading times, quicker initialization and more room for your app logic.</p>
+<div class="grid_8 suffix_2">
+ <p>A super micro tiny DOM library for authoring HTML5 mobile web applications.</p>
+</div>
+<div class="clear">&nbsp;</div>
+
+<div class="prefix_2 grid_6 suffix_4">
<pre>
// a trivial example
x$('#btn').click( function (e) {
x$('#msg').html('Thanks for your submission!');
})
-</pre>
-
+</pre>
</div>
-
<div class="grid_2">
<h1>features</h1>
</div>
<div class="grid_10">
<ul class="no-indent">
- <li>Clean and familiar chaining syntax.</li>
- <li>Super tiny footprint at 13kb.</li>
- <li>The only framework with targetted builds for WebKit, IE Mobile and BlackBerry.</li>
- <li>MIT Licensed.</li>
+ <li>Clean, familiar, chaining syntax.</li>
+ <li>Super tiny <strong>13kb</strong> footprint <small>(<strong>not</strong> gzipped)</small>.</li>
+ <li>Only library with targeted builds for WebKit, IE Mobile, and BlackBerry.</li>
+ <li><a href="/license">MIT Licensed</a>.</li>
</ul>
</div>
+<div class="clear">&nbsp;</div>
+
<div class="grid_2">
<h1>why</h1>
</div>
<div class="grid_10">
- <p>XUI was born in 2008 while the popular <a href="http://phonegap.com">PhoneGap</a> framework was being developed out of neccessity for a solid DOM framework that understood the latency and initialization characteristics of the mobile web. Today most frameworks are still catching up to the mobile revolution, tacking on compatability as an afterthought and, often, only for iOS. XUI is the smallest framework that works across all the devices in the mobile landscape and it does not try and dictate a page structure or widget paradigm. Most mobile applications consist of linked lists and buttons which, we feel, HTML does a fine job of rendering with a little CSS.
+ <p>XUI was born in 2008 while the popular <a href="http://phonegap.com">PhoneGap</a> framework was being developed. It was created out of necessity for a solid DOM framework that understood the latency and initialization characteristics of the mobile web. Today most frameworks are still catching up to the mobile revolution, tacking on compatibility as an afterthought and, often, only for iOS.</p>
+ <p>XUI is the smallest framework that works across all of the devices in the mobile landscape. It does not try and dictate a page structure or widget paradigm. Instead, it uses the DOM and since most mobile applications consist of lists and buttons, we feel, HTML and CSS do a fine job of rendering.
</p>
</div>
+<div class="clear">&nbsp;</div>
+
<div class="grid_2">
<h1>alternatives</h1>
</div>
<div class="grid_10">
- <p>
- Web development for handhelds and tablets is heating up fast! If xui isn't enough for you maybe one of these frameworks can help:
+ <p>Mobile Web development is heating up fast! If xui isn't enough for you, then check out:</p>
<ul>
<li><a href="http://jqtouch.com">jQTouch</a></li>
<li><a href="http://joapp.com">Jo</a></li>
<li><a href="http://sencha.com">Sencha Touch</a></li>
<li><a href="http://jquerymobile.com">jQuery Mobile</a></li>
<li><a href="http://zeptojs.com">Zepto</a></li>
</ul>
- </p>
</div>
View
@@ -45,7 +45,7 @@
<ul>
<li><a <%- isCurrent(current, "downloads") %> href="/downloads">Downloads</a></li>
<li><a href="http://github.com/xui/xui-plugins">Plugins</a></li>
- <li><a href="/tests/tests/index.html">Test Suite</a></li>
+ <li><a href="/tests/tests/index.html">Tests</a></li>
<li><a <%- isCurrent(current, "license") %> href="/license">License</a></li>
</ul>
</div>

0 comments on commit a562a5b

Please sign in to comment.