Merge branch 'master' into navigation

This commit is contained in:
Kin Blas 2011-05-23 17:00:32 -07:00
commit 368d3e55b4
3 changed files with 2 additions and 2 deletions

1
Makefile Executable file → Normal file
View file

@ -94,7 +94,6 @@ css: init
# Build the minified CSS file
cssmin: init css
# Build the minified CSS file
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSMIN}
@@java -jar build/yuicompressor-2.4.4.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
# Build the normal JS file

1
docs/toolbars/bars-themes.html Executable file → Normal file
View file

@ -120,6 +120,7 @@
<a href="index.html" data-role="button" data-icon="arrow-l" data-iconpos="right">left</a>
<a href="index.html" data-role="button" data-icon="arrow-r" data-iconpos="right">right</a>
<a href="index.html" data-role="button" data-icon="arrow-u" data-iconpos="right">up</a>
<a href="index.html" data-role="button" data-icon="arrow-d" data-iconpos="right">down</a>
</div>
<div data-role="footer" data-theme="d">

View file

@ -123,7 +123,7 @@
nsNormalize: function(prop){
if(!prop) return;
return $.camelCase($.mobile.ns + prop);
return $.camelCase( $.mobile.ns + prop );
}
});