Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 368d3e5

Browse files
committed
Merge branch 'master' into navigation
2 parents 5e87e84 + fe7ba3f commit 368d3e5

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

Makefile

100755100644
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ css: init
9494
# Build the minified CSS file
9595
cssmin: init css
9696
# Build the minified CSS file
97-
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSMIN}
9897
@@java -jar build/yuicompressor-2.4.4.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
9998

10099
# Build the normal JS file

docs/toolbars/bars-themes.html

100755100644
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ <h3>Footers</h3>
120120
<a href="index.html" data-role="button" data-icon="arrow-l" data-iconpos="right">left</a>
121121
<a href="index.html" data-role="button" data-icon="arrow-r" data-iconpos="right">right</a>
122122
<a href="index.html" data-role="button" data-icon="arrow-u" data-iconpos="right">up</a>
123+
<a href="index.html" data-role="button" data-icon="arrow-d" data-iconpos="right">down</a>
123124
</div>
124125

125126
<div data-role="footer" data-theme="d">

js/jquery.mobile.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
nsNormalize: function(prop){
124124
if(!prop) return;
125125

126-
return $.camelCase($.mobile.ns + prop);
126+
return $.camelCase( $.mobile.ns + prop );
127127
}
128128
});
129129

0 commit comments

Comments
 (0)