Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jquery/jquery-mobile
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeresig
jeresig committed Mar 31, 2011
2 parents 40d32c8 + 0fd3a0b commit 93cf7e4
Show file tree
Hide file tree
Showing 245 changed files with 17 additions and 22,184 deletions.
Binary file modified docs/_assets/images/version.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions docs/pages/docs-pages.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ <h2>Mobile page structure</h2>
&lt;html&gt;
&lt;head&gt;
&lt;title&gt;Page Title&lt;/title&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css&quot; /&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/jquery-1.5.min.js&quot;&gt;&lt;/script&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js&quot;&gt;&lt;/script&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.css&quot; /&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/jquery-1.5.2.min.js&quot;&gt;&lt;/script&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a3.min.js&quot;&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;

Expand Down Expand Up @@ -75,9 +75,9 @@ <h2>Complete single page template</h2>
&lt;html&gt;
&lt;head&gt;
&lt;title&gt;Page Title&lt;/title&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css&quot; /&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/jquery-1.4.3.min.js&quot;&gt;&lt;/script&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js&quot;&gt;&lt;/script&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a3.min.css&quot; /&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/jquery-1.5.2.min.js&quot;&gt;&lt;/script&gt;
&lt;script type=&quot;text/javascript&quot; src=&quot;http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a3.min.js&quot;&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;

Expand Down
2 changes: 0 additions & 2 deletions docs/pages/link-formats.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ <h1>Link formats</h1>

<li data-role="list-divider">Phone links</li>
<li><a href="tel:15555555555">Phone: tel:15555555555</a></li>
<li><a href="wtai://wp/mc;15555555555">Phone: wtai://wp/mc;15555555555</a></li>
<li><a href="dc:234*234*234">Phone: dc:234*234*234</a></li>
<li data-role="list-divider">Other</li>
<li><a href="#">A href="#" will return false</a></li>
</ul>
Expand Down
22 changes: 11 additions & 11 deletions docs/toolbars/footer-persist-b.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,70 +24,70 @@ <h1>Albums</h1>
<img src="../lists/images/album-bb.jpg" />
<h3>Broken Bells</h3>
<p>Broken Bells</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">

<img src="../lists/images/album-hc.jpg" />
<h3>Warning</h3>
<p>Hot Chip</p>

</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-p.jpg" />
<h3>Wolfgang Amadeus Phoenix</h3>
<p>Phoenix</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-ok.jpg" />
<h3>Of The Blue Colour Of The Sky</h3>
<p>Ok Go</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-ws.jpg" />
<h3>Elephant</h3>
<p>The White Stripes</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-rh.jpg" />
<h3>Kid A</h3>
<p>Radiohead</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-xx.jpg" />
<h3>XX</h3>
<p>XX</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-mg.jpg" />
<h3>Congratulations</h3>
<p>MGMT</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-ag.jpg" />
<h3>Ashes Grammar</h3>
<p>A Sunny Day in Glasgow</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>

<li><a href="index.html">
<img src="../lists/images/album-k.jpg" />
<h3>Hot Fuss</h3>
<p>Killers</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
<li><a href="index.html">
<img src="../lists/images/album-af.jpg" />
<h3>The Suburbs</h3>
<p>Arcade Fire</p>
</a><a href="lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a><a href="../lists/lists-split-purchase.html" data-rel="dialog" data-transition="slideup">Purchase album
</a></li>
</ul>

Expand Down
168 changes: 0 additions & 168 deletions experiments/api-viewer/docs/add/index.html
View file

This file was deleted.

97 changes: 0 additions & 97 deletions experiments/api-viewer/docs/addClass/index.html
View file

This file was deleted.

Loading

0 comments on commit 93cf7e4

Please sign in to comment.