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

This commit is contained in:
scottjehl 2010-10-15 16:49:53 -04:00
commit 21d608f0b4
4 changed files with 14 additions and 6 deletions

View file

@ -80,6 +80,15 @@ zip: clean min cssmin
# Used by the jQuery team to deploy a build to the CDN
deploy: zip
# Deploy to CDN
@@mv ${DIR} $1
@@cp ${DIR}.zip $1/
@@scp -r $1 jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
@@mv $1 ${DIR}
# Deploy Demos
@@mkdir -p ${VER}
@@cp -r index.html themes experiments docs ${VER}/
@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|href="themes/default"|href="http://code.jquery.com/mobile/${VER}/${DIR}.min.css"|g' {} \;
@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="js/all"|src="http://code.jquery.com/mobile/${VER}/${DIR}.min.js"|g' {} \;
@@scp -r ${VER} jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/

View file

@ -19,10 +19,9 @@
<ul data-role="listview" data-inset="true">
<li><a href="docs-pages.html">Anatomy of a page</a></li>
<li><a href="docs-links.html">Linking pages</a></li>
<li><a href="docs-transitions.html">Page transitions</a></li>
<li><a href="docs-dialogs.html">Dialogs</a></li>
<li><a href="docs-navmodel.html">Ajax, hashes &amp; history</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>
</ul>

View file

@ -20,9 +20,9 @@
<p>jQuery Mobile has a rich <a href="../themes/index.html">theming system</a> that gives you full control of how pages are styled. There is detailed theming documentation within each page widget, but let's look at a few high-level examples of how theming is applied.</p>
<p>The <code>data-theme</code> attribute can be applied to the header and footer containers to apply any of the lettered theme color swatches. While the <code>data-theme</code> attribute could be added to the content container, we recommend adding it instead to <code>div</code> or other container that has been assigned the <code>data-role="page"</code> attribute to ensure that the background colors are applied to the full page.</p>
<p>The <code>data-theme</code> attribute can be applied to the header and footer containers to apply any of the lettered theme color swatches. While the <code>data-theme</code> attribute could be added to the content container, we recommend adding it instead to <code>div</code> or container that has been assigned the <code>data-role="page"</code> attribute to ensure that the background color is applied to the full page.</p>
<p>Below are examples of each of our default Theme's five swatches applied consistently across all page elements. Typically, you would mix and match swatches on various parts of the page to create visual texture &mdash: and the default jQuery Mobile Theme does mix and match &mdash; but this shows how each single swatch styles the various page elements:</p>
<p>Below are examples of each of our default Theme's five swatches applied consistently across all page elements. Typically, you would mix and match swatches on various parts of the page to create visual texture &mdash; and the default jQuery Mobile Theme does mix and match &mdash; but this shows how each single swatch applies styles to various page elements:</p>

View file

@ -1,7 +1,7 @@
//quick & dirty theme switcher, written to potentially work as a bookmarklet
(function($){
$.themeswitcher = function(){
var themesDir = 'http://jquerymobile.com/test/themes/',
var themesDir = 'themes/',
themes = ['default','dobson'],
currentPage = $('.ui-page-active'),
menuPage = $( '<div data-role=\'dialog\' data-theme=\'a\'>' +
@ -48,4 +48,4 @@
//change page now
$.changePage(currentPage, menuPage, 'pop', false);
};
})(jQuery);
})(jQuery);