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

This commit is contained in:
Todd Parker 2010-10-12 09:53:47 -04:00
commit 6fc05c956e
59 changed files with 153 additions and 131 deletions

View file

@ -18,8 +18,10 @@
.ui-controlgroup-horizontal div.ui-checkbox:last-child, .ui-controlgroup-horizontal div.ui-radio:last-child { margin-right: 0; }
.ui-controlgroup-horizontal .ui-controlgroup-last { margin-right: 0; }
.ui-controlgroup .ui-checkbox label, .ui-controlgroup .ui-radio label { font-size: 16px; }
/* conflicts with listview..
.ui-controlgroup .ui-btn-icon-notext { width: 30px; height: 30px; text-indent: -9999px; }
.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { padding: 5px 6px 5px 5px; }
*/
@media screen and (min-width: 480px){
.ui-controlgroup-label { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }

View file

@ -15,8 +15,8 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margi
.ui-listbox { position: absolute; padding: 0; z-index: 100 !important; width: 80%; max-width: 350px; padding: 6px; }
.ui-listbox-hidden { top: -999999px; left: -99999px; }
.ui-listbox-screen { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 99; }
.ui-screen-hidden, .ui-listbox .ui-li .ui-icon { display: none; }
.ui-btn-active .ui-icon { display: block; }
.ui-screen-hidden, .ui-listbox-list .ui-li .ui-icon { display: none; }
.ui-listbox-list .ui-btn-active .ui-icon { display: block; }
/*used in listbox - to be removed/replaced with page-style hiding*/
.ui-helper-hidden,.ui-mobile .ui-content-hidden { display: none; }

View file

@ -8,7 +8,7 @@ input.ui-slider-input { display: inline-block; width: 40px; }
select.ui-slider-switch { display: none; }
div.ui-slider { position: relative; display: inline-block; overflow: visible; height: 15px; padding: 0; margin: 0 2% 0 15px; top: 4px; width: 66%; }
a.ui-slider-handle { position: absolute; z-index: 10; top: 50%; width: 28px; height: 28px; margin-top: -15px; margin-left: -15px; }
a.ui-slider-handle .ui-btn-inner { padding-left: 0; padding-right: 0; }
@media screen and (min-width: 480px){
label.ui-slider { display: inline-block; width: 20%; margin: 0 2% 0 0; }
div.ui-slider { width: 45%; }

View file

@ -4,5 +4,6 @@
* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
*/
/* fixed page header & footer configuration */
.ui-header, .ui-footer, .ui-page-fullscreen .ui-header, .ui-page-fullscreen .ui-footer { position: absolute; z-index: 1000; overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; }
.ui-header, .ui-footer, .ui-page-fullscreen .ui-header, .ui-page-fullscreen .ui-footer { position: absolute; overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; }
.ui-header-fixed, .ui-footer-fixed { z-index: 1000; }
.ui-footer-duplicate, .ui-page-fullscreen .ui-fixed-inline { display: none; }

View file

@ -54,21 +54,36 @@
/* interaction states */
.ui-btn-up-a { border: 1px solid #000; background: #333333; font-weight: bold; color: #fff; cursor: pointer; text-shadow: 0 1px 1px #000; text-decoration: none; background-image: -moz-linear-gradient(top, #555555, #333333); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #555555),color-stop(1, #333333)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#555555', EndColorStr='#333333')"; }
.ui-btn-up-a a.ui-link-inherit { color: #fff; }
.ui-btn-hover-a { border: 1px solid #000; background: #646464; font-weight: bold; color: #fff; text-shadow: 0 -1px 1px #000; text-decoration: none; background-image: -moz-linear-gradient(top, #848484, #646464); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #848484),color-stop(1, #646464)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#848484', EndColorStr='#646464')"; }
.ui-btn-hover-a a.ui-link-inherit { color: #fff; }
.ui-btn-down-a { border: 1px solid #000; background: #3d3d3d; font-weight: bold; color: #fff; text-shadow: 0 -1px 1px #000; background-image: -moz-linear-gradient(top, #333333, #5a5a5a); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #333333),color-stop(1, #5a5a5a)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#333333', EndColorStr='#5a5a5a')"; }
.ui-btn-down-a a.ui-link-inherit { color: #fff; }
.ui-btn-up-a, .ui-btn-hover-a, .ui-btn-down-a { font-family: Helvetica, Arial, sans-serif; }
.ui-btn-up-b { border: 1px solid #145072; background: #387bbe; font-weight: bold; color: #fff; cursor: pointer; text-shadow: 0 -1px 1px #145072; text-decoration: none; background-image: -moz-linear-gradient(top, #4e89c5, #2567ab); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #4e89c5),color-stop(1, #2567ab)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#4e89c5', EndColorStr='#2567ab')"; }
.ui-btn-up-b a.ui-link-inherit { color: #fff; }
.ui-btn-hover-b { border: 1px solid #014D68; background: #5397d5; font-weight: bold; color: #fff; text-shadow: 0 -1px 1px #014D68; background-image: -moz-linear-gradient(top, #81b2e0, #397cbe); text-decoration: none; background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #81b2e0),color-stop(1, #397cbe)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#81b2e0', EndColorStr='#397cbe')"; }
.ui-btn-hover-b a.ui-link-inherit { color: #fff; }
.ui-btn-down-b { border: 1px solid #225377; background: #3577bb; font-weight: bold; color: #fff; text-shadow: 0 -1px 1px #225377; background-image: -moz-linear-gradient(top, #3577db, #6b9bcd); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #3577db),color-stop(1, #6b9bcd)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#3577db', EndColorStr='#6b9bcd')"; }
.ui-btn-down-b a.ui-link-inherit { color: #fff; }
.ui-btn-up-b, .ui-btn-hover-b, .ui-btn-down-b { font-family: Helvetica, Arial, sans-serif; }
.ui-btn-up-c { border: 1px solid #B3B3B3; background: #d0d4d2; font-weight: bold; color: #2F3E46; cursor: pointer; text-shadow: 0 -1px 1px #fff; text-decoration: none; background-image: -moz-linear-gradient(top, #e9ebea, #d0d4d2); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #e9ebea),color-stop(1, #d0d4d2)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e9ebea', EndColorStr='#d0d4d2')"; }
.ui-btn-up-c a.ui-link-inherit { color: #2F3E46; }
.ui-btn-hover-c { border: 1px solid #808080; background: #fff; font-weight: bold; color: #2F3E46; text-decoration: none; text-shadow: 0 -1px 1px #fff; background-image: -moz-linear-gradient(top, #fdfdfd, #f0f0f0); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #fdfdfd),color-stop(1, #f0f0f0)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fdfdfd', EndColorStr='#f0f0f0')"; }
.ui-btn-hover-c a.ui-link-inherit { color: #2F3E46; }
.ui-btn-down-c { border: 1px solid #808080; background: #ced0d2; font-weight: bold; color: #2F3E46; text-shadow: none; background-image: -moz-linear-gradient(top, #ced0d2, #e5e6e7); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #ced0d2),color-stop(1, #e5e6e7)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ced0d2', EndColorStr='#e5e6e7')"; }
.ui-btn-down-c a.ui-link-inherit { color: #2F3E46; }
.ui-btn-up-c, .ui-btn-hover-c, .ui-btn-down-c { font-family: Helvetica, Arial, sans-serif; }
.ui-btn-up-d { border: 1px solid #F7C942; background: #fadb4e; font-weight: bold; color: #333; cursor: pointer; text-shadow: 0 -1px 1px #fff; text-decoration: none; text-shadow: 0 1px 0 #fff; background-image: -moz-linear-gradient(top, #fceda7, #fadb4e); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #fceda7),color-stop(1, #fadb4e)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fceda7', EndColorStr='#fadb4e')"; }
.ui-btn-up-d a.ui-link-inherit { color: #333; }
.ui-btn-hover-d { border: 1px solid #F7C942; background: #fadb4e; font-weight: bold; color: #333; text-decoration: none; text-shadow: 0 -1px 1px #fff; background-image: -moz-linear-gradient(top, #fcfdb7, #fafb5e); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #fcfdb7),color-stop(1, #fafb5e)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fcfdb7', EndColorStr='#fafb5e')"; }
.ui-btn-hover-d a.ui-link-inherit { color: #333; }
.ui-btn-down-d { border: 1px solid #F7C942; background: #fadb4e; font-weight: bold; color: #333; text-shadow: none; background-image: -moz-linear-gradient(top, #fadb4e, #fceda7); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #fadb4e),color-stop(1, #fceda7)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fadb4e', EndColorStr='#fceda7')"; }
.ui-btn-down-d a.ui-link-inherit { color: #333; }
.ui-btn-up-d, .ui-btn-hover-d, .ui-btn-down-d { font-family: Helvetica, Arial, sans-serif; }
/*lists*/
.ui-btn-up-e { border: 1px solid #000; background: #333333; font-weight: bold; color: #fff; cursor: pointer; text-shadow: 0 1px 1px #000; text-decoration: none; background-image: -moz-linear-gradient(top, #555555, #333333); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #555555),color-stop(1, #333333)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#555555', EndColorStr='#333333')"; }

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,9 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="../docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Forms</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Links</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Lists</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Intro</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Buttons</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Dialog Example</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Pages</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
<script type="text/javascript" src="docs/docs.js"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Static Containers, States</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../css/all" />
<script type="text/javascript" src="../js/all"></script>
</head>
<body>
@ -60,7 +60,7 @@
<h3 id="lists">Lists</h3>
<p>There are 2 supported list view styles. The system defaults to the "a" swatch (silver in default theme) and it can be switched to "b" via the <code>data-theme</code> attribute.</p>
<ul data-role="listview" data-inset="true" data-theme="e">
<ul data-role="listview" data-inset="true" data-theme="c">
<li><a href="index.html">List item A</a></li>
<li><a href="index.html">List item A</a></li>
<li><a href="index.html">List item A</a></li>
@ -149,7 +149,7 @@
<h3>Extensible themes</h3>
<p>The powerful thing about the new jQuery Mobile theme system is that you can now add as many color swatches as you like within a single theme. In the future ThemeRoller tool, you will be able to add new swatches through an easy-to-use web interface. Until then, you can add new swatches manually by copying the block of theme style rules for an existing swatch, renaming the rules a new letter (e) and changing colors.</p>
<p>You can then you can reference the new theme by adding the <code>data-theme="e"</code> attribute to your markup. If you set a theme swatch letter, the framework simply applies classes that include the letter you specify so it's critical that your active theme file include rules for the letters specified in your markup.</p>
<p>You can then you can reference the new theme by adding the <code>data-theme="c"</code> attribute to your markup. If you set a theme swatch letter, the framework simply applies classes that include the letter you specify so it's critical that your active theme file include rules for the letters specified in your markup.</p>
</div><!-- end content -->

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Toolbars demo</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Fixed toolbars variation</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Toolbars demo</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Toolbars demo</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Persistent footer demo</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - Persistent footer demo</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Docs - Toolbars</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -2,8 +2,8 @@
<html>
<head>
<title>jQuery Mobile Framework - navbar Example</title>
<link rel="stylesheet" media="only all" href="css/all" />
<script type="text/javascript" src="js/all"></script>
<link rel="stylesheet" media="only all" href="../../css/all" />
<script type="text/javascript" src="../../js/all"></script>
</head>
<body>

View file

@ -15,12 +15,12 @@ $.fn.buttonMarkup = function( options ){
if(el.is('[data-theme]')){
return el.attr('data-theme');
}
//if not, find closest theme container
if(el.parents('body').length){
var themedParent = el.closest('[class*=ui-bar-],[class*=ui-body-],[class*=ui-list-]');
return themedParent.length ? themedParent.attr('class').match(/ui-(bar|body|list)-([a-z])/)[2] : 'c';
//if not, try to find closest theme container
else if( el.parents('body').length ) {
var themedParent = el.closest('[class*=ui-bar-],[class*=ui-body-]');
return themedParent.length ? themedParent.attr('class').match(/ui-(bar|body)-([a-z])/)[2] : 'c';
}
else {
else{
return 'c';
}
})(),

View file

@ -6,12 +6,12 @@
*/
(function($){
$.fn.controlgroup = function(options){
var o = $.extend({
return $(this).each(function(){
var o = $.extend({
direction: $( this ).data( "type" ) || "vertical",
shadow: false
},options);
return $(this).each(function(){
var groupheading = $(this).find('>legend'),
flCorners = o.direction == 'horizontal' ? ['ui-corner-left', 'ui-corner-right'] : ['ui-corner-top', 'ui-corner-bottom'],
type = $(this).find('input:eq(0)').attr('type');

View file

@ -18,7 +18,7 @@ $.fixedToolbars = (function(){
var currentstate = 'inline',
delayTimer,
ignoreTargets = 'a,input,textarea,select,button,label,.ui-header-fixed,.ui-footer-fixed',
toolbarSelector = '.ui-page-active .ui-header-fixed, .ui-page-active .ui-footer-fixed:not(.ui-footer-duplicate)',
toolbarSelector = '.ui-header-fixed, .ui-footer-fixed:not(.ui-footer-duplicate)', //removed scope temporarily - these used to be scoped to ui-page-active
stickyFooter, //for storing quick references to duplicate footers
supportTouch = $.support.touch,
touchStartEvent = supportTouch ? "touchstart" : "mousedown",

View file

@ -8,8 +8,8 @@
$.widget( "mobile.listview", $.mobile.widget, {
options: {
theme: "f",
countTheme: "f",
theme: "c",
countTheme: "c",
headerTheme: "b",
dividerTheme: "b",
splitTheme: "b",

View file

@ -18,10 +18,8 @@ $.widget( "mobile.page", $.mobile.widget, {
this.element.find( "[data-role=nojs]" ).addClass( "ui-nojs" );
this._enchanceControls();
//links in bars, or those with data-role become buttons
this.element.find( "[data-role=button], .ui-bar a" ).not( ".ui-btn" ).buttonMarkup();
//pre-find data els
var $dataEls = this.element.find( "[data-role]" ).andSelf().each(function() {
var $this = $( this ),
role = $this.data( "role" ),
@ -64,8 +62,6 @@ $.widget( "mobile.page", $.mobile.widget, {
.prependTo( $this );
}
$this.children( "a" ).buttonMarkup();
//page title
$this.children( ":header" )
.addClass( "ui-title" )
@ -98,16 +94,22 @@ $.widget( "mobile.page", $.mobile.widget, {
case "ajaxform":
$this[ role ]();
break;
case "controlgroup":
// FIXME for some reason this has to come before the form control stuff (see above)
$this.controlgroup();
break;
}
});
//links in bars, or those with data-role become buttons
this.element.find( "[data-role=button], .ui-bar a, .ui-header a, .ui-footer a" )
.not( ".ui-btn" )
.buttonMarkup();
this.element
.find('[data-role="controlgroup"]')
.controlgroup();
//links within content areas
this.element.find( ".ui-body a:not(.ui-btn):not(.ui-link-inherit)" )
.addClass( "ui-link" );
.addClass( "ui-link" );
//fix toolbars
this.element.fixHeaderFooter();