From b0df463af9c7c026450113f39bc93c1fe186d8d6 Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Tue, 27 Sep 2011 14:21:34 -0400 Subject: [PATCH 1/4] =?UTF-8?q?Fixes=20issue=20where=20clicking=20the=20ed?= =?UTF-8?q?ges=20of=20a=20custom=20select=20wouldn=E2=80=99t=20trigger=20t?= =?UTF-8?q?he=20native=20select=20list,=20as=20well=20as=20an=20issue=20wh?= =?UTF-8?q?ere=20the=20native=20select=20list=20was=20showing=20then=20imm?= =?UTF-8?q?ediately=20hiding=20in=20IE7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/jquery.mobile.forms.select.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/jquery.mobile.forms.select.css b/themes/default/jquery.mobile.forms.select.css index aea87643..623d8199 100644 --- a/themes/default/jquery.mobile.forms.select.css +++ b/themes/default/jquery.mobile.forms.select.css @@ -6,7 +6,7 @@ .ui-select { display: block; position: relative; } .ui-select select { position: absolute; left: -9999px; top: -9999px; } .ui-select .ui-btn { overflow: hidden; } -.ui-select .ui-btn select { cursor: pointer; -webkit-appearance: button; left: 0; top:0; width: 100%; height: 100%; opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); } +.ui-select .ui-btn select { cursor: pointer; -webkit-appearance: button; left: 0; top:0; width: 100%; min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); z-index: 2; } @-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }} .ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; } From d1002ba9688505403da728f21fd8cf45b1e26acb Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Tue, 27 Sep 2011 14:24:44 -0400 Subject: [PATCH 2/4] =?UTF-8?q?Fixes=20#2532=20=E2=80=94=20Regression=20in?= =?UTF-8?q?troduced=20while=20addressing=20#1392.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/jquery.mobile.listview.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/jquery.mobile.listview.css b/themes/default/jquery.mobile.listview.css index 22050728..2bab2263 100644 --- a/themes/default/jquery.mobile.listview.css +++ b/themes/default/jquery.mobile.listview.css @@ -38,9 +38,9 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid .ui-li-has-count .ui-li-count { position: absolute; font-size: 11px; font-weight: bold; padding: .2em .5em; top: 50%; margin-top: -.9em; right: 38px; } .ui-li-divider .ui-li-count, .ui-li-static .ui-li-count { right: 10px; } .ui-li-has-alt .ui-li-count { right: 55px; } -.ui-li-link-alt { position: absolute; width: 40px; height: 100%; border-width: 0; border-left-width: 1px; top: 0; right: 0; margin: 0; padding: 0; } -.ui-li-link-alt .ui-btn { overflow: hidden; position: absolute; right: 8px; top: 50%; margin: -11px 0 0 0; border-bottom-width: 1px; } -.ui-li-link-alt .ui-btn-inner { padding: 0; position: static; } +.ui-li-link-alt { position: absolute; width: 40px; height: 100%; border-width: 0; border-left-width: 1px; top: 0; right: 0; margin: 0; padding: 0; z-index: 2; } +.ui-li-link-alt .ui-btn { overflow: hidden; position: absolute; right: 8px; top: 50%; margin: -11px 0 0 0; border-bottom-width: 1px; z-index: -1;} +.ui-li-link-alt .ui-btn-inner { padding: 0; height: 100%; position: absolute; width: 100%; top: 0; left: 0;} .ui-li-link-alt .ui-btn .ui-icon { right: 50%; margin-right: -9px; } .ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner { border-top: 0px; } From f0a7d0b963b8716736378e610b3215c90e08056c Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Tue, 27 Sep 2011 15:55:19 -0400 Subject: [PATCH 3/4] =?UTF-8?q?Fixes=20#2513=20=E2=80=94=20Also=20addresse?= =?UTF-8?q?s=20issue=20where=201px=20top=20border=20highlight=20on=20contr?= =?UTF-8?q?olgroup=20buttons=20was=20aligned=20with=20top=20of=20icon,=20r?= =?UTF-8?q?ather=20than=20the=20top=20of=20the=20button.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/jquery.mobile.button.css | 4 ++-- themes/default/jquery.mobile.controlgroup.css | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/themes/default/jquery.mobile.button.css b/themes/default/jquery.mobile.button.css index 31ef7117..c705112d 100644 --- a/themes/default/jquery.mobile.button.css +++ b/themes/default/jquery.mobile.button.css @@ -9,8 +9,8 @@ .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 { width: 20px; height: 20px; padding: 2px 1px 2px 3px; text-indent: -9999px; } -.ui-btn-icon-notext .ui-btn-inner { padding: 0; } +.ui-btn-icon-notext { width: 24px; height: 24px; text-indent: -9999px; } +.ui-btn-icon-notext .ui-btn-inner { padding: 2px 1px 2px 3px; } .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, diff --git a/themes/default/jquery.mobile.controlgroup.css b/themes/default/jquery.mobile.controlgroup.css index 61dea4b6..bc21bd67 100644 --- a/themes/default/jquery.mobile.controlgroup.css +++ b/themes/default/jquery.mobile.controlgroup.css @@ -12,9 +12,8 @@ .ui-controlgroup-vertical .ui-checkbox, .ui-controlgroup-vertical .ui-radio { margin: 0; border-bottom-width: 0; } .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 -1px 0 0; } -.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; } +.ui-controlgroup-horizontal .ui-btn { display: inline-block; margin: 0 -5px 0 0; } +.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; margin: 0 -1px 0 0; } .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 085a1040058407aa62145a714a275d72d651f01d Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Tue, 27 Sep 2011 16:47:11 -0400 Subject: [PATCH 4/4] =?UTF-8?q?Fixes=20#2538=20=E2=80=94=20Button=20wasn?= =?UTF-8?q?=E2=80=99t=20getting=20the=20appropriate=20=E2=80=9Chas-count?= =?UTF-8?q?=E2=80=9D=20class.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.mobile.forms.select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.mobile.forms.select.js b/js/jquery.mobile.forms.select.js index 7caa3224..8897fd60 100644 --- a/js/jquery.mobile.forms.select.js +++ b/js/jquery.mobile.forms.select.js @@ -118,7 +118,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, { this.buttonCount = $( "" ) .addClass( "ui-li-count ui-btn-up-c ui-btn-corner-all" ) .hide() - .appendTo( button ); + .appendTo( button.addClass('ui-li-has-count') ); } // Disable if specified