Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-04-20 22:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master'

Browse source
This commit is contained in:
scottjehl 2011-02-03 17:22:34 -05:00
commit d123334ef0
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -61,7 +61,7 @@ css:
cssmin: css
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${CSSMIN}
@@java -jar build/yuicompressor-2.4.2.jar --type css ${CSS} >> ${CSSMIN}
@@java -jar build/yuicompressor-2.4.4.jar --type css ${CSS} >> ${CSSMIN}
mobile:
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${MAX}

BIN
build/yuicompressor-2.4.2.jar → build/yuicompressor-2.4.4.jar
View file

Binary file not shown.

6
docs/pages/docs-pages.html
View file

@ -31,9 +31,9 @@
<html>
<head>
<title>Page Title</title>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.js"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" />
<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a3.min.js"></script>
</head>
<body>

6
docs/pages/multipage-template.html
View file

@ -3,9 +3,9 @@
<head>
<meta charset="utf-8" />
<title>Page Title</title>
<link rel="stylesheet" href="../../themes/default/" />
<script type="text/javascript" src="../../js/jquery.js"></script>
<script type="text/javascript" src="../../js/"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" />
<script src="http://code.jquery.com/jquery-1.5.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a2.min.js"></script>
<body>
<!-- Start of first page -->

6
docs/pages/page-template.html
View file

@ -3,9 +3,9 @@
<head>
<meta charset="utf-8" />
<title>Page Title</title>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
<script src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.js"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" />
<script src="http://code.jquery.com/jquery-1.5.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a2.min.js"></script>
</head>
<body>

5
index.html
View file

@ -47,10 +47,7 @@
<li><a href="docs/lists/index.html">List views</a></li>
</ul>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
<li data-role="list-divider">Demos</li>
<li><a href="experiments/api-viewer/index.html">jQuery API browser</a></li>
</ul>
</div>