Skip to content

Commit

Permalink
Revert "Preview: Pack alternative icon examples into a collapsible"
Browse files Browse the repository at this point in the history 
This reverts commit ee24a96.
  • Loading branch information
Gabriel Schulhof committed Jun 2, 2014
1 parent ee24a96 commit cc20dd0
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 38 deletions.
31 changes: 12 additions & 19 deletions jqm/1.4.2/preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ <h1 class="ui-title" tabindex="0" role="heading" aria-level="1">A</h1>
<li data-role="list-divider" data-theme="a" data-swatch="a" data-form="ui-bar-a">List Header</li>
<li data-form="ui-body-a" data-swatch="a" data-theme="a">Read-only list item</li>
<li><a class="ui-btn-a ui-btn ui-btn-icon-right ui-icon-carat-r" data-form="ui-btn-up-a" data-swatch="a" data-theme="a" href="#">Linked list item</a></li>
<li class="ui-alt-icon"><a class="ui-btn-a ui-btn ui-btn-icon-right ui-icon-carat-r" data-form="ui-btn-up-a" data-swatch="a" data-theme="a" href="#">Alternative icon</a></li>
</ul>

<div data-role="fieldcontain">
Expand Down Expand Up @@ -67,32 +68,24 @@ <h1 class="ui-title" tabindex="0" role="heading" aria-level="1">A</h1>
</select>
</div>

<div data-role="fieldcontain" class="ui-alt-icon">
<select name="select-choice" id="select-choice-alt-a" data-native-menu="false" data-theme="a" data-form="ui-btn-up-a">
<option>Alternative icon</option>
<option value="standard">Option 1</option>
<option value="rush">Option 2</option>
<option value="express">Option 3</option>
<option value="overnight">Option 4</option>
</select>
</div>

<input type="text" data-theme="a" value="Text Input" class="input" data-form="ui-body-a" />

<div data-role="fieldcontain">
<input type="range" name="slider" value="50" min="0" max="100" data-form="ui-body-a" data-theme="a" data-highlight="true" />
</div>

<button data-icon="star" data-theme="a" data-form="ui-btn-up-a">Button</button>
<div data-role="collapsible" data-inset="false">
<h2>Alternative icons</h2>
<div class="ui-alt-icon">
<ul data-inset="true" data-role="listview">
<li data-role="list-divider" data-theme="a" data-swatch="a" data-form="ui-bar-a">List Header</li>
<li><a href="#">Linked list item</li>
</ul>
<div data-role="fieldcontain">
<select name="select-choice" id="select-choice-alt-a" data-native-menu="false" data-theme="a" data-form="ui-btn-up-a">
<option>Select menu</option>
<option value="standard">Option 1</option>
<option value="rush">Option 2</option>
<option value="express">Option 3</option>
<option value="overnight">Option 4</option>
</select>
</div>
<button data-icon="star" data-theme="a" data-form="ui-btn-up-a">Button</button>
</div>
</div>
<button data-icon="star" data-theme="a" data-form="ui-btn-up-a" class="ui-alt-icon">Alternative icon</button>
</div>
</div><!--end_swatches-->

Expand Down
30 changes: 11 additions & 19 deletions js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,7 @@ TR.initThemeRoller = function() {
"<li data-role=\"list-divider\" data-theme=\"a\" data-swatch=\"a\" data-form=\"ui-bar-a\">List Header</li>" +
"<li data-form=\"ui-body-a\" data-swatch=\"a\" data-theme=\"a\">Read-only list item</li>" +
"<li><a class=\"ui-btn-a ui-btn ui-btn-icon-right ui-icon-carat-r\" data-form=\"ui-btn-up-a\" data-swatch=\"a\" data-theme=\"a\" href=\"#\">Linked list item</a></li>" +
"<li class=\"ui-alt-icon\"><a class=\"ui-btn-a ui-btn ui-btn-icon-right ui-icon-carat-r\" data-form=\"ui-btn-up-a\" data-swatch=\"a\" data-theme=\"a\" href=\"#\">Alternative icon</a></li>" +
"</ul>" +
"<div data-role=\"fieldcontain\">" +
"<fieldset data-role=\"controlgroup\">" +
Expand All @@ -1417,31 +1418,22 @@ TR.initThemeRoller = function() {
"<option value=\"express\">Option 3</option>" +
"<option value=\"overnight\">Option 4</option>" +
"</select>" +
"</div>" +
"<div data-role=\"fieldcontain\" class=\"ui-alt-icon\">" +
"<select name=\"select-choice-alt\" id=\"select-choice-alt-a\" data-native-menu=\"false\" data-theme=\"a\" data-form=\"ui-btn-up-a\">" +
"<option>Alternative icon</option>" +
"<option value=\"standard\">Option 1</option>" +
"<option value=\"rush\">Option 2</option>" +
"<option value=\"express\">Option 3</option>" +
"<option value=\"overnight\">Option 4</option>" +
"</select>" +
"</div>" +
"<input type=\"text\" value=\"Text Input\" data-theme=\"a\" class=\"input\" data-form=\"ui-body-a\" />" +
"<div data-role=\"fieldcontain\">" +
"<input type=\"range\" name=\"slider\" value=\"50\" min=\"0\" max=\"100\" data-form=\"ui-body-a\" data-theme=\"a\" data-highlight=\"true\" />" +
"</div>" +
"<button data-icon=\"star\" data-theme=\"a\" data-form=\"ui-btn-up-a\">Button</button>" +
"<div data-role=\"collapsible\" data-inset=\"false\">" +
"<h2>Alternative icons</h2>" +
"<div class=\"ui-alt-icon\">" +
"<ul data-inset=\"true\" data-role=\"listview\">" +
"<li data-role=\"list-divider\" data-theme=\"a\" data-swatch=\"a\" data-form=\"ui-bar-a\">List Header</li>" +
"<li><a href=\"#\">Linked list item</li>" +
"</ul>" +
"<div data-role=\"fieldcontain\">" +
"<select name=\"select-choice\" id=\"select-choice-alt-a\" data-native-menu=\"false\" data-theme=\"a\" data-form=\"ui-btn-up-a\">" +
"<option>Select menu</option>" +
"<option value=\"standard\">Option 1</option>" +
"<option value=\"rush\">Option 2</option>" +
"<option value=\"express\">Option 3</option>" +
"<option value=\"overnight\">Option 4</option>" +
"</select>" +
"</div>" +
"<button data-icon=\"star\" data-theme=\"a\" data-form=\"ui-btn-up-a\">Button</button>" +
"</div>" +
"</div>" +
"<button data-icon=\"star\" data-theme=\"a\" data-form=\"ui-btn-up-a\" class=\"ui-alt-icon\">Button</button>" +
"</div>" +
"</div>";
} else if ( TR.versionCompare( "[1.3-)" ) ) {
Expand Down

0 comments on commit cc20dd0

Please sign in to comment.