Skip to content

Commit 68dba30

Browse files
committed
Hopefully fixes jquery-archive#1392 — Accounts for z-index issues with input type=submit/button elements, icons, and text within .ui-btn, both inside and outside listviews (including split views). Also accounts for current phase of the moon, just in case.
1 parent 2b5d9a9 commit 68dba30

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

themes/default/jquery.mobile.button.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.ui-header .ui-btn, .ui-footer .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; }
88
.ui-btn-inline { display: inline-block; }
99
.ui-btn-inner { padding: .6em 25px; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; }
10+
.ui-btn input, .ui-btn button { z-index: 2; }
1011
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }
1112
.ui-btn-icon-notext { width: 24px; height: 24px; }
1213
.ui-btn-icon-notext .ui-btn-inner { padding: 2px 1px 2px 3px; }
@@ -30,7 +31,7 @@
3031
.ui-bar .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 27px; }
3132

3233
/*btn icon positioning*/
33-
.ui-btn-icon-notext .ui-icon { display: block; }
34+
.ui-btn-icon-notext .ui-icon { display: block; z-index: 0;}
3435
.ui-btn-icon-left .ui-icon, .ui-btn-icon-right .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
3536
.ui-btn-icon-top .ui-icon, .ui-btn-icon-bottom .ui-icon { position: absolute; left: 50%; margin-left: -9px; }
3637
.ui-btn-icon-left .ui-icon { left: 10px; }

themes/default/jquery.mobile.listview.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
.ui-content .ui-listview-inset { margin: 1em 0; }
99
.ui-listview, .ui-li { list-style:none; padding:0; }
1010
.ui-li, .ui-li.ui-field-contain { display: block; margin:0; position: relative; overflow: visible; text-align: left; border-width: 0; border-top-width: 1px; }
11-
.ui-li .ui-btn-text { z-index: 0; }
1211
.ui-li .ui-btn-text a.ui-link-inherit { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
1312
.ui-li-divider, .ui-li-static { padding: .5em 15px; font-size: 14px; font-weight: bold; }
1413
.ui-li-divider { counter-reset: listnumbering; }
@@ -23,6 +22,7 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
2322
.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-count { padding-right: 45px; }
2423
.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow { padding-right: 30px; }
2524
.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow.ui-li-has-count { padding-right: 75px; }
25+
.ui-li-has-count .ui-btn-text { padding-right: 15px; }
2626
.ui-li-heading { font-size: 16px; font-weight: bold; display: block; margin: .6em 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
2727
.ui-li-desc { font-size: 12px; font-weight: normal; display: block; margin: -.5em 0 .6em; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
2828
.ui-li-thumb, .ui-li-icon { position: absolute; left: 1px; top: 0; max-height: 80px; max-width: 80px; }

0 commit comments

Comments
 (0)