From c0922001fd941d520e8955cb3bf22a45653f2f49 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 18:39:52 -0400 Subject: [PATCH 01/11] added link-inherit and font settings to all buttons so lists can use any button style. --- css/jquery.mobile.theme.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/css/jquery.mobile.theme.css b/css/jquery.mobile.theme.css index 93f13e46..9f94666a 100755 --- a/css/jquery.mobile.theme.css +++ b/css/jquery.mobile.theme.css @@ -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')"; } From 11b6f30eeaa671eeb575be72b041e2e72ed44808 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 18:58:40 -0400 Subject: [PATCH 02/11] commented out some concflicting styles. --- css/jquery.mobile.controlgroup.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/jquery.mobile.controlgroup.css b/css/jquery.mobile.controlgroup.css index f5e8d44c..63391c3e 100644 --- a/css/jquery.mobile.controlgroup.css +++ b/css/jquery.mobile.controlgroup.css @@ -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; } From d8977cf9376f3046a1f3f146fa6f55c07fa5f6f3 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 18:59:03 -0400 Subject: [PATCH 03/11] made listviews default to C theme, now that any button theme will work --- js/jquery.mobile.listview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.mobile.listview.js b/js/jquery.mobile.listview.js index 3735ba6c..c625304b 100644 --- a/js/jquery.mobile.listview.js +++ b/js/jquery.mobile.listview.js @@ -8,8 +8,8 @@ $.widget( "mobile.listview", $.mobile.widget, { options: { - theme: "f", - countTheme: "f", + theme: "c", + countTheme: "c", headerTheme: "b", dividerTheme: "b", splitTheme: "b", From b759068019e2b7bf25a12bc58076c1ecf536488b Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:06:04 -0400 Subject: [PATCH 04/11] fixed leaky icons --- css/jquery.mobile.forms.select.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/jquery.mobile.forms.select.css b/css/jquery.mobile.forms.select.css index 75d22229..f152354d 100644 --- a/css/jquery.mobile.forms.select.css +++ b/css/jquery.mobile.forms.select.css @@ -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; } From faf0b66868e75bdaa0cd415fc1b5aae422a6be9d Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:15:02 -0400 Subject: [PATCH 05/11] improved inherited theming of buttons, and controlgroup orientation --- js/jquery.mobile.controlGroup.js | 6 +++--- js/jquery.mobile.page.js | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js index f9f1f14a..9af79122 100644 --- a/js/jquery.mobile.controlGroup.js +++ b/js/jquery.mobile.controlGroup.js @@ -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'); diff --git a/js/jquery.mobile.page.js b/js/jquery.mobile.page.js index 1d29957b..48aec644 100644 --- a/js/jquery.mobile.page.js +++ b/js/jquery.mobile.page.js @@ -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(); From 8d433bd8345f7eec32452e3c8c75805a916f60c0 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:22:23 -0400 Subject: [PATCH 06/11] z-index applied only to floaty headers --- css/jquery.mobile.headerfooter.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/jquery.mobile.headerfooter.css b/css/jquery.mobile.headerfooter.css index b3739af1..aad36a94 100644 --- a/css/jquery.mobile.headerfooter.css +++ b/css/jquery.mobile.headerfooter.css @@ -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; } From 3428753aa63133f1e82bde53a0383e02db31b63f Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:32:19 -0400 Subject: [PATCH 07/11] cleaned up theme inheritance logic a bit --- js/jquery.mobile.buttonMarkup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js index 37057a82..69fffcc0 100644 --- a/js/jquery.mobile.buttonMarkup.js +++ b/js/jquery.mobile.buttonMarkup.js @@ -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'; } })(), From 88d237b46841498f91604c664b0f63b09ee954c4 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:34:45 -0400 Subject: [PATCH 08/11] removed the "antenna" on the slider. Fixes #158 --- css/jquery.mobile.forms.slider.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/jquery.mobile.forms.slider.css b/css/jquery.mobile.forms.slider.css index 7fed7bfb..862c872c 100644 --- a/css/jquery.mobile.forms.slider.css +++ b/css/jquery.mobile.forms.slider.css @@ -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%; } From 65cd3ae0abadb51aa873f9018d8063082dd34a34 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:44:14 -0400 Subject: [PATCH 09/11] fixed paths to js and css files when these files are opened standalone --- docs/buttons.html | 4 ++-- docs/buttons/buttons-grouped.html | 6 +++--- docs/buttons/buttons-icons.html | 6 +++--- docs/buttons/buttons-inline.html | 6 +++--- docs/buttons/buttons-themes.html | 6 +++--- docs/buttons/buttons-types.html | 6 +++--- docs/buttons/docs-buttons.html | 5 +++-- docs/buttons/index.html | 5 +++-- docs/intro.html | 4 ++-- docs/links.html | 4 ++-- docs/lists/api-lists.html | 4 ++-- docs/lists/docs-lists.html | 4 ++-- docs/lists/index.html | 4 ++-- docs/lists/lists-count.html | 4 ++-- docs/lists/lists-formatting.html | 4 ++-- docs/lists/lists-inset.html | 4 ++-- docs/lists/lists-nested.html | 4 ++-- docs/lists/lists-ol.html | 4 ++-- docs/lists/lists-readonly.html | 4 ++-- docs/lists/lists-search.html | 4 ++-- docs/lists/lists-split.html | 4 ++-- docs/lists/lists-thumbnails.html | 4 ++-- docs/lists/lists-ul.html | 4 ++-- docs/page.html | 4 ++-- docs/pages/api-pages.html | 4 ++-- docs/pages/dialog.html | 4 ++-- docs/pages/docs-dialogs.html | 4 ++-- docs/pages/docs-links.html | 4 ++-- docs/pages/docs-navmodel.html | 4 ++-- docs/pages/docs-pages.html | 4 ++-- docs/pages/index.html | 4 ++-- docs/pages/pages-themes.html | 4 ++-- docs/toolbars/api-bars.html | 4 ++-- docs/toolbars/bars-fixed.html | 4 ++-- docs/toolbars/bars-fullscreen.html | 4 ++-- docs/toolbars/bars-inline.html | 4 ++-- docs/toolbars/bars-themes.html | 4 ++-- docs/toolbars/docs-bars.html | 4 ++-- docs/toolbars/docs-footers.html | 4 ++-- docs/toolbars/docs-headers.html | 4 ++-- docs/toolbars/docs-navbars.html | 4 ++-- docs/toolbars/footer-persist-result.html | 4 ++-- docs/toolbars/footer-persist.html | 4 ++-- docs/toolbars/index.html | 4 ++-- docs/toolbars/navbar.html | 4 ++-- 45 files changed, 97 insertions(+), 95 deletions(-) diff --git a/docs/buttons.html b/docs/buttons.html index af3b9790..7331ea41 100755 --- a/docs/buttons.html +++ b/docs/buttons.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Buttons - - + + diff --git a/docs/buttons/buttons-grouped.html b/docs/buttons/buttons-grouped.html index b602ac29..d65c877b 100755 --- a/docs/buttons/buttons-grouped.html +++ b/docs/buttons/buttons-grouped.html @@ -2,9 +2,9 @@ jQuery Mobile Docs - Buttons - - - + + + diff --git a/docs/buttons/buttons-icons.html b/docs/buttons/buttons-icons.html index ddec82cf..894549bf 100755 --- a/docs/buttons/buttons-icons.html +++ b/docs/buttons/buttons-icons.html @@ -2,9 +2,9 @@ jQuery Mobile Docs - Buttons - - - + + + diff --git a/docs/buttons/buttons-inline.html b/docs/buttons/buttons-inline.html index 5c6925da..57853891 100755 --- a/docs/buttons/buttons-inline.html +++ b/docs/buttons/buttons-inline.html @@ -2,9 +2,9 @@ jQuery Mobile Docs - Buttons - - - + + + diff --git a/docs/buttons/buttons-themes.html b/docs/buttons/buttons-themes.html index 57135090..e47288f0 100755 --- a/docs/buttons/buttons-themes.html +++ b/docs/buttons/buttons-themes.html @@ -2,9 +2,9 @@ jQuery Mobile Docs - Buttons - - - + + + diff --git a/docs/buttons/buttons-types.html b/docs/buttons/buttons-types.html index 83069b5f..c895104a 100755 --- a/docs/buttons/buttons-types.html +++ b/docs/buttons/buttons-types.html @@ -2,9 +2,9 @@ jQuery Mobile Docs - Lists - - - + + + diff --git a/docs/buttons/docs-buttons.html b/docs/buttons/docs-buttons.html index fc88cacb..cf2b76fd 100755 --- a/docs/buttons/docs-buttons.html +++ b/docs/buttons/docs-buttons.html @@ -2,8 +2,9 @@ jQuery Mobile Docs - Lists - - + + + diff --git a/docs/buttons/index.html b/docs/buttons/index.html index b2bc1d7c..c9504828 100755 --- a/docs/buttons/index.html +++ b/docs/buttons/index.html @@ -2,8 +2,9 @@ jQuery Mobile Docs - Buttons - - + + + diff --git a/docs/intro.html b/docs/intro.html index efd6d270..ede89d96 100755 --- a/docs/intro.html +++ b/docs/intro.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Intro - - + + diff --git a/docs/links.html b/docs/links.html index fa6c129c..66a5bb27 100755 --- a/docs/links.html +++ b/docs/links.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Links - - + + diff --git a/docs/lists/api-lists.html b/docs/lists/api-lists.html index d46b51e0..1305c46c 100755 --- a/docs/lists/api-lists.html +++ b/docs/lists/api-lists.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/docs-lists.html b/docs/lists/docs-lists.html index fd1e3cda..aba48ddd 100755 --- a/docs/lists/docs-lists.html +++ b/docs/lists/docs-lists.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/index.html b/docs/lists/index.html index b5c453f2..1e59e9c1 100755 --- a/docs/lists/index.html +++ b/docs/lists/index.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-count.html b/docs/lists/lists-count.html index 1b778c22..dbad659f 100755 --- a/docs/lists/lists-count.html +++ b/docs/lists/lists-count.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-formatting.html b/docs/lists/lists-formatting.html index dbb7dce8..5c204d41 100755 --- a/docs/lists/lists-formatting.html +++ b/docs/lists/lists-formatting.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-inset.html b/docs/lists/lists-inset.html index 17771fd8..74d08034 100755 --- a/docs/lists/lists-inset.html +++ b/docs/lists/lists-inset.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-nested.html b/docs/lists/lists-nested.html index 504235d8..4ee2f444 100755 --- a/docs/lists/lists-nested.html +++ b/docs/lists/lists-nested.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-ol.html b/docs/lists/lists-ol.html index dbf8fb7a..c212bf26 100755 --- a/docs/lists/lists-ol.html +++ b/docs/lists/lists-ol.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-readonly.html b/docs/lists/lists-readonly.html index 92ebfa4d..20fadb55 100755 --- a/docs/lists/lists-readonly.html +++ b/docs/lists/lists-readonly.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-search.html b/docs/lists/lists-search.html index d336c887..0a9a53da 100755 --- a/docs/lists/lists-search.html +++ b/docs/lists/lists-search.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-split.html b/docs/lists/lists-split.html index f7954e93..f0d8be19 100755 --- a/docs/lists/lists-split.html +++ b/docs/lists/lists-split.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-thumbnails.html b/docs/lists/lists-thumbnails.html index febd8bb1..b09eec91 100755 --- a/docs/lists/lists-thumbnails.html +++ b/docs/lists/lists-thumbnails.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/lists/lists-ul.html b/docs/lists/lists-ul.html index bca4d2cc..5df8ec49 100755 --- a/docs/lists/lists-ul.html +++ b/docs/lists/lists-ul.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/page.html b/docs/page.html index b0428500..260450fb 100755 --- a/docs/page.html +++ b/docs/page.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Intro - - + + diff --git a/docs/pages/api-pages.html b/docs/pages/api-pages.html index 6e3e5cb7..939093d2 100755 --- a/docs/pages/api-pages.html +++ b/docs/pages/api-pages.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Buttons - - + + diff --git a/docs/pages/dialog.html b/docs/pages/dialog.html index 61a4e18e..3eec8b55 100644 --- a/docs/pages/dialog.html +++ b/docs/pages/dialog.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Dialog Example - - + + diff --git a/docs/pages/docs-dialogs.html b/docs/pages/docs-dialogs.html index 5017e5ac..eee7ea72 100755 --- a/docs/pages/docs-dialogs.html +++ b/docs/pages/docs-dialogs.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/pages/docs-links.html b/docs/pages/docs-links.html index 396a5fc9..a859e498 100755 --- a/docs/pages/docs-links.html +++ b/docs/pages/docs-links.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/pages/docs-navmodel.html b/docs/pages/docs-navmodel.html index 7eb4a5c5..8c568ae5 100755 --- a/docs/pages/docs-navmodel.html +++ b/docs/pages/docs-navmodel.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/pages/docs-pages.html b/docs/pages/docs-pages.html index 2dbf1769..22c96621 100755 --- a/docs/pages/docs-pages.html +++ b/docs/pages/docs-pages.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/pages/index.html b/docs/pages/index.html index 03806847..302039e4 100755 --- a/docs/pages/index.html +++ b/docs/pages/index.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/pages/pages-themes.html b/docs/pages/pages-themes.html index d36d275c..a18c92bc 100755 --- a/docs/pages/pages-themes.html +++ b/docs/pages/pages-themes.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Pages - - + + diff --git a/docs/toolbars/api-bars.html b/docs/toolbars/api-bars.html index ff55854f..08743005 100755 --- a/docs/toolbars/api-bars.html +++ b/docs/toolbars/api-bars.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/bars-fixed.html b/docs/toolbars/bars-fixed.html index 51d55270..af46fc4d 100755 --- a/docs/toolbars/bars-fixed.html +++ b/docs/toolbars/bars-fixed.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Toolbars demo - - + + diff --git a/docs/toolbars/bars-fullscreen.html b/docs/toolbars/bars-fullscreen.html index c8559ff1..039b78c5 100755 --- a/docs/toolbars/bars-fullscreen.html +++ b/docs/toolbars/bars-fullscreen.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Fixed toolbars variation - - + + diff --git a/docs/toolbars/bars-inline.html b/docs/toolbars/bars-inline.html index 2dd5a7ec..ccf0a079 100755 --- a/docs/toolbars/bars-inline.html +++ b/docs/toolbars/bars-inline.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Toolbars demo - - + + diff --git a/docs/toolbars/bars-themes.html b/docs/toolbars/bars-themes.html index ca0d9454..d1fd2f93 100755 --- a/docs/toolbars/bars-themes.html +++ b/docs/toolbars/bars-themes.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Toolbars demo - - + + diff --git a/docs/toolbars/docs-bars.html b/docs/toolbars/docs-bars.html index 7c3213e8..79e4c2cf 100755 --- a/docs/toolbars/docs-bars.html +++ b/docs/toolbars/docs-bars.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/docs-footers.html b/docs/toolbars/docs-footers.html index 0cd5744e..3b81b00b 100755 --- a/docs/toolbars/docs-footers.html +++ b/docs/toolbars/docs-footers.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html index eca90bc4..20021b30 100755 --- a/docs/toolbars/docs-headers.html +++ b/docs/toolbars/docs-headers.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/docs-navbars.html b/docs/toolbars/docs-navbars.html index 46ae8816..b188eac2 100755 --- a/docs/toolbars/docs-navbars.html +++ b/docs/toolbars/docs-navbars.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/footer-persist-result.html b/docs/toolbars/footer-persist-result.html index 702e493d..79e0a62e 100755 --- a/docs/toolbars/footer-persist-result.html +++ b/docs/toolbars/footer-persist-result.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Persistent footer demo - - + + diff --git a/docs/toolbars/footer-persist.html b/docs/toolbars/footer-persist.html index 387386cb..3e8c6b12 100755 --- a/docs/toolbars/footer-persist.html +++ b/docs/toolbars/footer-persist.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Persistent footer demo - - + + diff --git a/docs/toolbars/index.html b/docs/toolbars/index.html index 8877963e..1fbfbf3a 100755 --- a/docs/toolbars/index.html +++ b/docs/toolbars/index.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Toolbars - - + + diff --git a/docs/toolbars/navbar.html b/docs/toolbars/navbar.html index e6035f7b..70f26ffe 100755 --- a/docs/toolbars/navbar.html +++ b/docs/toolbars/navbar.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - navbar Example - - + + From 6c3c308de1f58b8cac2a23344fd6dc8ae33e51de Mon Sep 17 00:00:00 2001 From: scottjehl Date: Mon, 11 Oct 2010 19:48:43 -0400 Subject: [PATCH 10/11] removing scope on headerfooters to see if it helps positioning --- js/jquery.mobile.fixHeaderFooter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js index 6695b54c..065203d7 100644 --- a/js/jquery.mobile.fixHeaderFooter.js +++ b/js/jquery.mobile.fixHeaderFooter.js @@ -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", From 867faa1ee8dcf6b7c13e25c069872bd601ccb32e Mon Sep 17 00:00:00 2001 From: scottjehl Date: Tue, 12 Oct 2010 09:53:34 -0400 Subject: [PATCH 11/11] a few more find/reps on the script and css urls --- docs/buttons/api-buttons.html | 4 ++-- docs/forms.html | 4 ++-- docs/lists/lists-divider.html | 4 ++-- docs/themes.html | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/buttons/api-buttons.html b/docs/buttons/api-buttons.html index 81ca6945..05aa6e41 100755 --- a/docs/buttons/api-buttons.html +++ b/docs/buttons/api-buttons.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Buttons - - + + diff --git a/docs/forms.html b/docs/forms.html index fe3b43bb..88e2cdc1 100755 --- a/docs/forms.html +++ b/docs/forms.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Forms - - + + diff --git a/docs/lists/lists-divider.html b/docs/lists/lists-divider.html index 2b6709bb..4d0a8906 100755 --- a/docs/lists/lists-divider.html +++ b/docs/lists/lists-divider.html @@ -2,8 +2,8 @@ jQuery Mobile Docs - Lists - - + + diff --git a/docs/themes.html b/docs/themes.html index 92adea97..d4da3ccc 100755 --- a/docs/themes.html +++ b/docs/themes.html @@ -2,8 +2,8 @@ jQuery Mobile Framework - Static Containers, States - - + + @@ -60,7 +60,7 @@

Lists

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 data-theme attribute.

-
    +
    • List item A
    • List item A
    • List item A
      • @@ -149,7 +149,7 @@

      Extensible themes

      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.

      -

      You can then you can reference the new theme by adding the data-theme="e" 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.

      +

      You can then you can reference the new theme by adding the data-theme="c" 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.