Skip to content

Commit

Permalink
Merge branch 'master' into pagecontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
@jblas
jblas committed Jan 12, 2011
2 parents ac46e94 + 9e6a3df commit 7057c70
Show file tree
Hide file tree
Showing 132 changed files with 2,430 additions and 655 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -101,7 +101,7 @@ deploy: zip
@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet" href="../../|rel="stylesheet" href="|g' {} \;
@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet" href="../|rel="stylesheet" href="|g' {} \;

@@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|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|<script type="text/javascript" src="js/all|<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript" src="js/all|' {} \;
@@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' {} \;

Expand Down
2 changes: 1 addition & 1 deletion docs/about/accessibility.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/about/features.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/about/index.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery UI Mobile Framework - Documentation</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/about/intro.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/about/platforms.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/events.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Events</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/globalconfig.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Configuring default settings</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/index.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery UI Mobile Framework - API</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/mediahelpers.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Responsive Layout Helpers</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/methods.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Methods</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
12 changes: 6 additions & 6 deletions docs/api/themes.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Framework - Static Containers, States</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down Expand Up @@ -151,7 +151,7 @@ <h2>Lists &amp; Buttons</h2>
<p>If you want to add visual emphasis to a button and help it stand out visually from its parent toolbar, an alternate swatch color can be set by adding a <code>data-theme="a"</code> to the anchor. Once an alternate swatch color is set on a button in the markup, the framework won't override that color if the parent theme is changed, because you made a conscious decision to set it.</p>

<div class="swatch-bars">
<div data-role="header" data-theme="a" class="ui-bar" data-nobackbtn="true">
<div data-role="header" data-theme="a" class="ui-bar" data-backbtn="false">
<div><!-- wrapper div to have control over butttons -->
<a href="index.html" data-icon="arrow-l" data-theme="a">A</a>
<a href="index.html" data-icon="arrow-l" data-theme="b">B</a>
Expand All @@ -160,7 +160,7 @@ <h2>Lists &amp; Buttons</h2>
<a href="index.html" data-icon="arrow-l" data-theme="e">E</a>
</div>
</div>
<div data-role="header" data-theme="b" class="ui-bar" data-nobackbtn="true">
<div data-role="header" data-theme="b" class="ui-bar" data-backbtn="false">
<div><!-- wrapper div to have control over butttons -->
<a href="index.html" data-icon="arrow-l" data-theme="a">A</a>
<a href="index.html" data-icon="arrow-l" data-theme="b">B</a>
Expand All @@ -169,7 +169,7 @@ <h2>Lists &amp; Buttons</h2>
<a href="index.html" data-icon="arrow-l" data-theme="e">E</a>
</div>
</div>
<div data-role="header" data-theme="c" class="ui-bar" data-nobackbtn="true">
<div data-role="header" data-theme="c" class="ui-bar" data-backbtn="false">
<div><!-- wrapper div to have control over butttons -->
<a href="index.html" data-icon="arrow-l" data-theme="a">A</a>
<a href="index.html" data-icon="arrow-l" data-theme="b">B</a>
Expand All @@ -178,7 +178,7 @@ <h2>Lists &amp; Buttons</h2>
<a href="index.html" data-icon="arrow-l" data-theme="e">E</a>
</div>
</div>
<div data-role="header" data-theme="d" class="ui-bar" data-nobackbtn="true">
<div data-role="header" data-theme="d" class="ui-bar" data-backbtn="false">
<div><!-- wrapper div to have control over butttons -->
<a href="index.html" data-icon="arrow-l" data-theme="a">A</a>
<a href="index.html" data-icon="arrow-l" data-theme="b">B</a>
Expand All @@ -187,7 +187,7 @@ <h2>Lists &amp; Buttons</h2>
<a href="index.html" data-icon="arrow-l" data-theme="e">E</a>
</div>
</div>
<div data-role="header" data-theme="e" class="ui-bar" data-nobackbtn="true">
<div data-role="header" data-theme="e" class="ui-bar" data-backbtn="false">
<div><!-- wrapper div to have control over butttons -->
<a href="index.html" data-icon="arrow-l" data-theme="a">A</a>
<a href="index.html" data-icon="arrow-l" data-theme="b">B</a>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/api-buttons.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/buttons-grouped.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/buttons-icons.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/buttons-inline.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/buttons-themes.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/buttons-types.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons/index.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/content/api-content.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<script type="text/javascript" src="../../js/"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion docs/content/content-collapsible.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>

Expand Down
2 changes: 1 addition & 1 deletion docs/content/content-grids.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/content/content-html.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/content/content-themes.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/content/index.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Content formatting</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/api-forms.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/docs-forms.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-all.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-checkboxes.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-radiobuttons.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-sample-response.php
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-sample.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion docs/forms/forms-search.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
Expand Down

0 comments on commit 7057c70

Please sign in to comment.