Merge branch 'master' of github.com:jquery/jquery-mobile

This commit is contained in:
scottjehl 2010-10-11 16:20:01 -04:00
commit f53fdbdb8b
2 changed files with 29 additions and 30 deletions

View file

@ -16,20 +16,19 @@
<div data-role="content" class="ui-body">
<p><strong>Inline</strong> buttons (default)</p>
<div data-inline="true" >
<a href="index.html" data-role="button">Cancel</a>
<a href="index.html" data-role="button" data-theme="b">Save</a>
</div>
<p><strong>Inline</strong> buttons</p>
<a href="index.html" data-role="button" data-inline="true">Cancel</a>
<a href="index.html" data-role="button" data-theme="b" data-inline="true">Save</a>
<p><strong>Inline toolbar</strong> buttons</p>
<div data-role="footer" data-position="inline">
<div data-inline="true">
<a href="index.html" data-role="button" data-icon="delete">Remove</a>
<a href="index.html" data-role="button" data-icon="plus">Add</a>
<a href="index.html" data-role="button" data-icon="arrow-u">Move</a>
</div>
<a href="index.html" data-role="button" data-icon="delete" data-inline="true">Remove</a>
<a href="index.html" data-role="button" data-icon="plus" data-inline="true">Add</a>
<a href="index.html" data-role="button" data-icon="arrow-u" data-inline="true">Move up</a>
<a href="index.html" data-role="button" data-icon="arrow-d" data-inline="true">Move down</a>
</div>

View file

@ -35,43 +35,43 @@
<p>Here are 4 buttons with icons that have a different swatch letter assigned via the <code>data-theme</code> attribute.</p>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Theme d</a>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
<h2>Theme variations</h2>
<p><strong>"a" theme</strong> on container with themed buttons inside</p>
<div data-role="content" data-theme="a">
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Theme d</a>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
</div>
<p><strong>"b" theme</strong> on container with themed buttons inside</p>
<div data-role="content" data-theme="b">
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Theme d</a>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
</div>
<p><strong>"c" theme</strong> on container with themed buttons inside</p>
<div data-role="content" data-theme="c">
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Theme d</a>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
</div>
<p><strong>"d" theme</strong> on container with themed buttons inside</p>
<div data-role="content" data-theme="d">
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Theme d</a>
<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
</div>
</div><!-- /content -->