From 42f7dccd7ea99fdb803ce52994c0c703bd12dd0f Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Thu, 22 Sep 2011 16:20:47 -0400 Subject: [PATCH 1/4] =?UTF-8?q?Fixes=20#1666=20=E2=80=94=20.ui-checkbox/.u?= =?UTF-8?q?i-radio=20floated=20rather=20than=20inline,=20to=20fix=20height?= =?UTF-8?q?=20and=20properly=20hide=20checkboxes/radios.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/jquery.mobile.controlgroup.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/jquery.mobile.controlgroup.css b/themes/default/jquery.mobile.controlgroup.css index d60c7191..61dea4b6 100644 --- a/themes/default/jquery.mobile.controlgroup.css +++ b/themes/default/jquery.mobile.controlgroup.css @@ -13,8 +13,8 @@ .ui-controlgroup-vertical .ui-controlgroup-last { border-bottom-width: 1px; } .ui-controlgroup-horizontal { padding: 0; } .ui-controlgroup-horizontal .ui-btn, -.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { display: inline-block; margin: 0 -5px 0 0; } -.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { display: inline; } +.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { display: inline-block; margin: 0 -1px 0 0; } +.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; } .ui-controlgroup-horizontal .ui-checkbox .ui-btn, .ui-controlgroup-horizontal .ui-radio .ui-btn, .ui-controlgroup-horizontal .ui-checkbox:last-child, .ui-controlgroup-horizontal .ui-radio:last-child { margin-right: 0; } .ui-controlgroup-horizontal .ui-controlgroup-last { margin-right: 0; } From 088454dc1ae15c444644899d0935d5b4bee0d7db Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Thu, 22 Sep 2011 16:56:37 -0400 Subject: [PATCH 2/4] =?UTF-8?q?Fixes=20#1392=20=E2=80=94=20Positions=20.ui?= =?UTF-8?q?-icon=20on=20lower=20z-index=20than=20.ui-btn-text,=20ensuring?= =?UTF-8?q?=20the=20click=20will=20register=20on=20the=20latter.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/jquery.mobile.button.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/themes/default/jquery.mobile.button.css b/themes/default/jquery.mobile.button.css index 6192ca7f..e229ca10 100644 --- a/themes/default/jquery.mobile.button.css +++ b/themes/default/jquery.mobile.button.css @@ -9,8 +9,9 @@ .ui-btn-inline { display: inline-block; } .ui-btn-inner { padding: .6em 25px; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; } .ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; } -.ui-btn-icon-notext { display: inline-block; width: 20px; height: 20px; padding: 2px 1px 2px 3px; text-indent: -9999px; } +.ui-btn-icon-notext { width: 20px; height: 20px; padding: 2px 1px 2px 3px; text-indent: -9999px; } .ui-btn-icon-notext .ui-btn-inner { padding: 0; } +.ui-btn-text { position: relative; z-index: 1; } .ui-btn-icon-notext .ui-btn-text { position: absolute; left: -999px; } .ui-btn-icon-left .ui-btn-inner { padding-left: 33px; } .ui-header .ui-btn-icon-left .ui-btn-inner, @@ -34,7 +35,7 @@ .ui-btn-icon-left .ui-icon, .ui-btn-icon-right .ui-icon { position: absolute; top: 50%; margin-top: -9px; } .ui-btn-icon-top .ui-icon, .ui-btn-icon-bottom .ui-icon { position: absolute; left: 50%; margin-left: -9px; } .ui-btn-icon-left .ui-icon { left: 10px; } -.ui-btn-icon-right .ui-icon {right: 10px; } +.ui-btn-icon-right .ui-icon { right: 10px; z-index: 0; } .ui-header .ui-btn-icon-left .ui-icon, .ui-footer .ui-btn-icon-left .ui-icon, .ui-bar .ui-btn-icon-left .ui-icon { left: 4px; } From e5e269394ef061aee3b693b7553b4fc07c39db6b Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 22 Sep 2011 09:46:35 -0700 Subject: [PATCH 3/4] remove empty else in nav --- js/jquery.mobile.navigation.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js index 47b119c8..7e6811b8 100755 --- a/js/jquery.mobile.navigation.js +++ b/js/jquery.mobile.navigation.js @@ -785,9 +785,6 @@ && RegExp.$1 ) { url = fileUrl = path.getFilePath( RegExp.$1 ); } - else{ - - } if ( base ) { base.set( fileUrl ); From 48928248d9032225d0be0428f6d3c75b1f500fdd Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 22 Sep 2011 14:40:51 -0700 Subject: [PATCH 4/4] remove gzip from combine --- combine.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/combine.php b/combine.php index deb1d798..cac1eeae 100644 --- a/combine.php +++ b/combine.php @@ -13,11 +13,6 @@ foreach ( $files as $file ) { $contents .= file_get_contents($file). "\n\n"; } -// If gzip is supported, send the file gzipped -if (substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')) { - ob_start("ob_gzhandler"); -} - // Set the content type, filesize and an expiration so its not cached header('Content-Type: ' . $type); header('Content-Length: ' . strlen($contents));