Skip to content

Commit 15ef91c

Browse files
author
scottjehl
committed
Merge remote branch 'origin/master'
2 parents 8fa56b6 + cf56769 commit 15ef91c

File tree

1 file changed

+63
-76
lines changed

1 file changed

+63
-76
lines changed

‎docs/toolbars/bars-fixed.html

Lines changed: 63 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<div data-role="page">
1515

16-
<div data-role="header" data-position="fixed">
16+
<div data-role="header" data-position="fixed" data-theme="b">
1717
<h1>Fixed toolbars</h1>
1818
<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
1919
</div>
@@ -32,96 +32,83 @@ <h2>Fixed toolbars will re-appear after you scroll</h2>
3232

3333

3434

35-
<h4>Here is some text to make the page very long</h4>
35+
<h3>Some text to make the page very long</h3>
3636

3737
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
3838

3939
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
4040

41-
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
4241

43-
<h4>And an inset list</h4>
42+
<h3>And an inset list</h3>
4443

45-
<ul data-role="listview" data-inset="true">
46-
<li>
47-
<img src="../lists/images/album-bb.jpg" />
48-
<h3><a href="index.html">Broken Bells</a></h3>
49-
<p>Broken Bells</p>
50-
<p class="ui-li-aside">$<strong>11.99</strong></p>
51-
</li>
52-
<li>
53-
<img src="../lists/images/album-hc.jpg" />
54-
<h3><a href="index.html">Warning</a></h3>
55-
<p>Hot Chip</p>
56-
<p class="ui-li-aside">$<strong>12.99</strong></p>
57-
</li>
58-
<li>
59-
<img src="../lists/images/album-p.jpg" />
60-
<h3><a href="index.html">Wolfgang Amadeus Phoenix</a></h3>
61-
<p>Phoenix</p>
62-
<p class="ui-li-aside">$<strong>11.99</strong></p>
63-
</li>
64-
<li>
65-
<img src="../lists/images/album-ok.jpg" />
66-
<h3><a href="index.html">Of The Blue Colour Of The Sky</a></h3>
67-
<p>Ok Go</p>
68-
<p class="ui-li-aside">$<strong>10.99</strong></p>
69-
</li>
70-
<li>
71-
<img src="../lists/images/album-ws.jpg" />
72-
<h3><a href="index.html">Elephant</a></h3>
73-
<p>The White Stripes</p>
74-
<p class="ui-li-aside">$<strong>9.99</strong></p>
75-
</li>
76-
<li>
77-
<img src="../lists/images/album-rh.jpg" />
78-
<h3><a href="index.html">Kid A</a></h3>
79-
<p>Radiohead</p>
80-
<p class="ui-li-aside">$<strong>11.99</strong></p>
81-
</li>
82-
<li>
83-
<img src="../lists/images/album-xx.jpg" />
84-
<h3><a href="index.html">XX</a></h3>
85-
<p>XX</p>
86-
<p class="ui-li-aside">$<strong>10.99</strong></p>
87-
</li>
88-
<li>
89-
<img src="../lists/images/album-mg.jpg" />
90-
<h3><a href="index.html">Congratulations</a></h3>
91-
<p>MGMT</p>
92-
<p class="ui-li-aside">$<strong>12.99</strong></p>
93-
</li>
94-
95-
<li>
96-
<img src="../lists/images/album-ag.jpg" />
97-
<h3><a href="index.html">Ashes Grammar</a></h3>
98-
<p>A Sunny Day in Glasgow</p>
99-
<p class="ui-li-aside">$<strong>11.99</strong></p>
100-
</li>
101-
102-
<li>
103-
<img src="../lists/images/album-k.jpg" />
104-
<h3><a href="index.html">Hot Fuss</a></h3>
105-
<p>Killers</p>
106-
<p class="ui-li-aside">$<strong>12.99</strong></p>
107-
</li>
108-
<li>
109-
<img src="../lists/images/album-af.jpg" />
110-
<h3><a href="index.html">The Suburbs</a></h3>
111-
<p>Arcade Fire</p>
112-
<p class="ui-li-aside">$<strong>12.99</strong></p>
113-
</li>
114-
</ul>
44+
<ul data-role="listview" data-inset="true">
45+
<li><a href="index.html">Inbox <span class="ui-li-count">12</span></a></li>
46+
<li><a href="index.html">Outbox <span class="ui-li-count">0</span></a></li>
47+
<li><a href="index.html">Drafts <span class="ui-li-count">4</span></a></li>
48+
<li><a href="index.html">Sent <span class="ui-li-count">328</span></a></li>
49+
<li><a href="index.html">Trash <span class="ui-li-count">62</span></a></li>
50+
</ul>
11551

52+
<br />
11653
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
11754

11855
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
11956

120-
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
57+
58+
<h3>Embedded form</h3>
59+
60+
<form action="#" method="get">
61+
62+
<div data-role="fieldcontain">
63+
<label for="name">Text Input:</label>
64+
<input type="text" name="name" id="name" value="" />
65+
</div>
66+
67+
<div data-role="fieldcontain">
68+
<label for="textarea">Textarea:</label>
69+
<textarea cols="40" rows="8" name="textarea" id="textarea"></textarea>
70+
</div>
71+
72+
<div data-role="fieldcontain">
73+
<label for="slider2">Flip switch:</label>
74+
<select name="slider2" id="slider2" data-role="slider">
75+
<option value="off">Off</option>
76+
<option value="on">On</option>
77+
</select>
78+
</div>
79+
80+
<div data-role="fieldcontain">
81+
<label for="slider">Slider:</label>
82+
<input type="range" name="slider" id="slider" value="0" min="0" max="100" />
83+
</div>
84+
85+
86+
<div data-role="fieldcontain">
87+
<label for="select-choice-1" class="select">Choose shipping method:</label>
88+
<select name="select-choice-1" id="select-choice-1">
89+
<option value="standard">Standard: 7 day</option>
90+
<option value="rush">Rush: 3 days</option>
91+
<option value="express">Express: next day</option>
92+
<option value="overnight">Overnight</option>
93+
</select>
94+
</div>
95+
96+
97+
<div class="ui-body ui-body-b">
98+
<fieldset class="ui-grid-a">
99+
<div class="ui-block-a"><button type="submit" data-theme="d">Cancel</button></div>
100+
<div class="ui-block-b"><button type="submit" data-theme="b">Submit</button></div>
101+
</fieldset>
102+
</div>
103+
</form>
104+
105+
<h3>A bit more text</h3>
106+
107+
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
121108

122109
</div>
123110

124-
<div data-role="footer" data-position="fixed">
111+
<div data-role="footer" data-position="fixed" data-theme="a">
125112
<h1>Fixed Footer</h1>
126113
</div>
127114

0 commit comments

Comments
 (0)