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

This commit is contained in:
Jordan Dobson 2010-10-15 19:54:37 -07:00
commit a3128c88d9
8 changed files with 16 additions and 16 deletions

View file

@ -23,10 +23,10 @@
<li><a href="buttons-inline.html">Inline buttons</a></li>
<li><a href="buttons-grouped.html">Grouped buttons</a></li>
<li><a href="buttons-themes.html">Theming buttons</a></li>
<li><a href="api-buttons.html">API documentation</a></li>
<!--<li><a href="api-buttons.html">API documentation</a></li>-->
</ul>
</div><!-- /ui-body wrapper -->
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -22,7 +22,7 @@
<p>There are two preset configurations layouts &mdash; two-column (using the <code>class</code> of <code>ui-grid-a</code>), and three-column (using the <code>class</code> of <code>ui-grid-b</code>) &mdash; that can be used in any situation that requires columns. Grids are 100% width, completely invisible (no borders or backgrounds) and don't have padding or margins, so they shouldn't interfere with the styles of elements placed inside them.</p>
<h2>Two column grids</h2>
<p>To build a two-column (50/50%) layout, start with a container with a <code>class</code> of <code>ui-grid-a</code> and add two child containers inside that are classed with <code>ui-block-a</code> for the first column and <code>ui-block-b</code> for the second:</p>
<p>To build a two-column (50/50%) layout, start with a container with a <code>class</code> of <code>ui-grid-a</code>, and add two child containers inside it classed with <code>ui-block-a</code> for the first column and <code>ui-block-b</code> for the second:</p>
<pre><code>
&lt;div class=&quot;ui-grid-a&quot;&gt;
@ -40,9 +40,9 @@
<div class="ui-block-b"><strong>I'm Block B</strong> and text inside will wrap.</div>
</div><!-- /grid-a -->
<p>As you see above, by default grid blocks have no style appearance; they simply present content side-by-side.</p>
<p>As you see above, by default grid blocks have no styles for appearance; they simply present content side-by-side.</p>
<p>The grid classes can be applied to any container. In this next example, we add <code>grid-a</code> to a <code>fieldset</code> to make the two button inside stretch to 50% of the screen width:</p>
<p>Grid classes can be applied to any container. In this next example, we add <code>ui-grid-a</code> to a <code>fieldset</code>, and apply the <code>ui-block</code> classes to the two buttons inside to stretch them each to 50% of the screen width:</p>
<pre><code>
&lt;fieldset class=&quot;ui-grid-a&quot;&gt;

View file

@ -23,10 +23,10 @@
<li><a href="content-grids.html">Layout grids (columns)</a></li>
<li><a href="content-collapsible.html">Collapsible content blocks</a></li>
<li><a href="content-themes.html">Theming content</a></li>
<li><a href="api-content.html">API documentation</a></li>
<!--<li><a href="api-content.html">API documentation</a></li>-->
</ul>
</div><!-- /ui-body wrapper -->
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -28,10 +28,10 @@
<li><a href="forms-checkboxes.html">Checkboxes</a></li>
<li><a href="forms-selects.html">Select menus</a></li>
<li><a href="forms-themes.html">Theming forms</a></li>
<li><a href="api-forms.html">API documentation</a></li>
<!--<li><a href="api-forms.html">API documentation</a></li>-->
</ul>
</div><!-- /ui-body wrapper -->
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -32,7 +32,7 @@
<li><a href="lists-search.html">Search filter bar</a></li>
<li><a href="lists-inset.html">Inset styled lists</a></li>
<li><a href="lists-themes.html">Theming lists</a></li>
<li><a href="api-lists.html">API documentation</a></li>
<!--<li><a href="api-lists.html">API documentation</a></li>-->
</ul>
@ -40,4 +40,4 @@
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -23,11 +23,11 @@
<li><a href="docs-dialogs.html">Dialogs</a></li>
<li><a href="docs-navmodel.html">Navigation: Ajax, hashes &amp; history</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>
<li><a href="api-pages.html">API documentation</a></li>
<!--<li><a href="api-pages.html">API documentation</a></li>-->
</ul>
</div><!-- /ui-body wrapper -->
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -27,11 +27,11 @@
<li><a href="navbar.html">Nav bar widget</a></li>
<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
<li><a href="bars-themes.html">Theming toolbars</a></li>
<li><a href="api-bars.html">API documentation</a></li>
<!--<li><a href="api-bars.html">API documentation</a></li>-->
</ul>
</div><!-- /content -->
</div><!-- /page -->
</body>
</html>
</html>

View file

@ -35,7 +35,7 @@
<li><a href="docs/content/index.html">Content formatting</a></li>
<li><a href="docs/forms/index.html">Form elements</a></li>
<li><a href="docs/lists/index.html">List views</a></li>
<li><a href="docs/events.html">Events</a></li>
<!--<li><a href="docs/events.html">Events</a></li>-->
</ul>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">