Skip to content

Commit f3e35d4

Browse files
author
scottjehl
committed
more updates to the docs markup. getting close!
1 parent 579f418 commit f3e35d4

File tree

77 files changed

+145
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+145
-97
lines changed

docs/_assets/css/jqm-docs.css

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/* jqm docs css
2+
3+
Beware: lots of last-minute CSS going on in here
4+
cobblers, shoes,
5+
*/
6+
17
body { background: #dddddd; }
28

39
.ui-mobile #jqm-home { background: #e5e5e5 url(../images/jqm-sitebg.png) top center repeat-x; }
@@ -93,8 +99,18 @@ p.intro {
9399
/* docs site layout */
94100

95101
@media all and (min-width: 650px){
96-
.ui-mobile #jqm-homeheader {max-width: 340px;}
97-
.ui-mobile .jqm-themeswitcher {float: right;
102+
103+
.jqm-home {
104+
position: absolute;
105+
left: 10px;
106+
top: 0;
107+
}
108+
109+
.ui-mobile #jqm-homeheader {
110+
max-width: 340px;
111+
}
112+
.ui-mobile .jqm-themeswitcher {
113+
float: right;
98114
}
99115
p.intro {
100116
border-top-color: #75ae18;
@@ -110,6 +126,7 @@ p.intro {
110126
}
111127
.type-interior .ui-content {
112128
background-position: 45%;
129+
overflow: hidden;
113130
}
114131
.content-secondary {
115132
text-align: left;
@@ -124,6 +141,12 @@ p.intro {
124141
padding: 20px 4% 0 0;
125142
background: none;
126143
}
144+
.type-index .content-secondary {
145+
padding: 0;
146+
}
147+
.type-index .content-secondary .ui-listview {
148+
margin: 0;
149+
}
127150

128151
.ui-mobile #jqm-homeheader {
129152
padding: 0;
@@ -145,7 +168,6 @@ p.intro {
145168
.type-interior .content-primary {
146169
padding: 1.5em 6% 3em 0;
147170
margin: 0;
148-
149171
}
150172
/* fix up the collapsibles - expanded on desktop */
151173
.content-secondary .ui-collapsible-heading {
@@ -159,7 +181,10 @@ p.intro {
159181
margin: 0;
160182
padding: 0;
161183
}
162-
184+
.type-interior .content-secondary .ui-li-divider {
185+
padding-top: 1em;
186+
padding-bottom: 1em;
187+
}
163188
.type-interior .content-secondary {
164189
margin: 0;
165190
padding: 0;

docs/_assets/js/jqm-docs.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ $('div').live('pagecreate',function(event){
77
appendEl = $(this).find('.ui-content');
88
}
99

10+
if( appendEl.is("[data-position]") ){
11+
return;
12+
}
13+
1014
$('<a href="#themeswitcher" data-'+ $.mobile.ns +'rel="dialog" data-'+ $.mobile.ns +'transition="pop">Switch theme</a>')
1115
.buttonMarkup({
1216
'icon':'gear',
@@ -20,7 +24,7 @@ $('div').live('pagecreate',function(event){
2024
$.themeswitcher();
2125
});
2226
}
23-
event.stopPropagation();
27+
2428
});
2529

2630
//collapse page navs after use
@@ -31,7 +35,17 @@ $(function(){
3135
});
3236

3337
function setDefaultTransition(){
34-
$.mobile.defaultPageTransition = $( window ).width() >= 650 ? "fade" : "slide";
38+
var winwidth = $( window ).width(),
39+
trans ="slide";
40+
41+
if( winwidth >= 1000 ){
42+
trans = "none";
43+
}
44+
else if( winwidth >= 650 ){
45+
trans = "fade";
46+
}
47+
48+
$.mobile.defaultPageTransition = trans;
3549
}
3650

3751
//set default documentation

docs/about/accessibility.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h2>Accessibility</h2>
3838

3939
<div data-role="collapsible" data-collapsed="true" data-theme="b">
4040

41-
<h3>Demos &amp; Docs Sections</h3>
41+
<h3>More in this section</h3>
4242

4343
<ul data-role="listview" data-theme="c" data-dividertheme="d">
4444
<li data-role="list-divider">Overview</li>

docs/about/features.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h2>Key features:</h2>
4545

4646
<div data-role="collapsible" data-collapsed="true" data-theme="b">
4747

48-
<h3>Demos &amp; Docs Sections</h3>
48+
<h3>More in this section</h3>
4949

5050
<ul data-role="listview" data-theme="c" data-dividertheme="d">
5151
<li data-role="list-divider">Overview</li>

docs/about/intro.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2>jQuery Mobile Overview</h2>
4242

4343
<div data-role="collapsible" data-collapsed="true" data-theme="b">
4444

45-
<h3>Demos &amp; Docs Sections</h3>
45+
<h3>More in this section</h3>
4646

4747
<ul data-role="listview" data-theme="c" data-dividertheme="d">
4848
<li data-role="list-divider">Overview</li>

docs/about/platforms.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h3 style="font-weight: normal; background: #fff; border-left: 7px solid #aaaaaa
8282

8383
<div data-role="collapsible" data-collapsed="true" data-theme="b">
8484

85-
<h3>Demos &amp; Docs Sections</h3>
85+
<h3>More in this section</h3>
8686

8787
<ul data-role="listview" data-theme="c" data-dividertheme="d">
8888
<li data-role="list-divider">Overview</li>

docs/api/events.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ <h2>Animation Events</h2>
140140

141141
<div data-role="collapsible" data-collapsed="true" data-theme="b">
142142

143-
<h3>Demos &amp; Docs Sections</h3>
143+
<h3>More in this section</h3>
144144

145145
<ul data-role="listview" data-theme="c" data-dividertheme="d">
146146

docs/api/globalconfig.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ <h2>Configurable options</h2>
132132

133133
<div data-role="collapsible" data-collapsed="true" data-theme="b">
134134

135-
<h3>Demos &amp; Docs Sections</h3>
135+
<h3>More in this section</h3>
136136

137137
<ul data-role="listview" data-theme="c" data-dividertheme="d">
138138

docs/api/mediahelpers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h3>Running Media Queries</h3>
102102

103103
<div data-role="collapsible" data-collapsed="true" data-theme="b">
104104

105-
<h3>Demos &amp; Docs Sections</h3>
105+
<h3>More in this section</h3>
106106

107107
<ul data-role="listview" data-theme="c" data-dividertheme="d">
108108

docs/api/methods.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ <h1>Methods</h1>
513513

514514
<div data-role="collapsible" data-collapsed="true" data-theme="b">
515515

516-
<h3>Demos &amp; Docs Sections</h3>
516+
<h3>More in this section</h3>
517517

518518
<ul data-role="listview" data-theme="c" data-dividertheme="d">
519519

0 commit comments

Comments
 (0)