Skip to content

Commit d64eaf0

Browse files
jblasjblas
committed
Merge branch 'master' of https://github.com/jquery/jquery-mobile 
2 parents 880df5f + 4618b12 commit d64eaf0

10 files changed

+25
-27
lines changed

‎js/jquery.mobile.collapsible.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
4545
}
4646
}
4747

48-
collapsibleContent.addClass( ( o.contentTheme ) ? ( "ui-btn-up-" + o.contentTheme ) : "");
48+
collapsibleContent.addClass( ( o.contentTheme ) ? ( "ui-body-" + o.contentTheme ) : "");
4949

5050
collapsibleHeading
5151
//drop heading in before content
@@ -61,7 +61,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
6161
iconPos: "left",
6262
icon: "plus",
6363
theme: o.theme
64-
})
64+
});
6565

6666
if ( !collapsibleSet.length ) {
6767
collapsibleHeading

‎js/jquery.mobile.forms.select.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
118118
this.buttonCount = $( "<span>" )
119119
.addClass( "ui-li-count ui-btn-up-c ui-btn-corner-all" )
120120
.hide()
121-
.appendTo( button );
121+
.appendTo( button.addClass('ui-li-has-count') );
122122
}
123123

124124
// Disable if specified

‎tests/unit/collapsible/collapsible_core.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@
129129
ok( collapsibles.eq(0).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-a" ), "Heading of first collapsible should have class ui-btn-up-a");
130130
ok( !collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-a" ), "Content of first collapsible should NOT have class ui-btn-up-a");
131131
ok( collapsibles.eq(1).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-b" ), "Heading of second collapsible should have class ui-btn-up-b");
132-
ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-b" ), "Content of second collapsible should have class ui-btn-up-b");
132+
ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-body-b" ), "Content of second collapsible should have class ui-btn-up-b");
133133
ok( collapsibles.eq(2).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-c" ), "Heading of third collapsible should have class ui-btn-up-c");
134-
ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-c" ), "Content of third collapsible should have class ui-btn-up-c");
134+
ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-body-c" ), "Content of third collapsible should have class ui-btn-up-c");
135135
start();
136136
}
137137
]);
@@ -147,15 +147,15 @@
147147
function() {
148148
var collapsibles = $.mobile.activePage.find( ".ui-collapsible" );
149149
ok( collapsibles.eq(0).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-a" ), "Heading of first collapsible should have class ui-btn-up-a");
150-
ok( !collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-a" ), "Content of first collapsible should NOT have class ui-btn-up-a");
151-
ok( collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-d" ), "Content of first collapsible should NOT have class ui-btn-up-d");
150+
ok( !collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-body-a" ), "Content of first collapsible should NOT have class ui-btn-up-a");
151+
ok( collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of first collapsible should NOT have class ui-btn-up-d");
152152
ok( collapsibles.eq(1).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-b" ), "Heading of second collapsible should have class ui-btn-up-b");
153-
ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-b" ), "Content of second collapsible should have class ui-btn-up-b");
153+
ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-body-b" ), "Content of second collapsible should have class ui-btn-up-b");
154154
ok( collapsibles.eq(2).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-d" ), "Heading of third collapsible should have class ui-btn-up-d");
155-
ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-d" ), "Content of third collapsible should have class ui-btn-up-d");
155+
ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of third collapsible should have class ui-btn-up-d");
156156
ok( !collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-collapsible-content-collapsed" ), "Content of third collapsible should NOT have class ui-collapsible-content-collapsed");
157157
ok( collapsibles.eq(3).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-d" ), "Heading of fourth collapsible should have class ui-btn-up-d");
158-
ok( collapsibles.eq(3).find( ".ui-collapsible-content" ).hasClass( "ui-btn-up-d" ), "Content of fourth collapsible should have class ui-btn-up-d");
158+
ok( collapsibles.eq(3).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of fourth collapsible should have class ui-btn-up-d");
159159
start();
160160
}
161161
]);

‎themes/default/images/icon-search-black.png‎

-1.22 KB
Binary file not shown.

‎themes/default/jquery.mobile.button.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
.ui-btn-inline { display: inline-block; }
1010
.ui-btn-inner { padding: .6em 25px; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; }
1111
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }
12-
.ui-btn-icon-notext { width: 20px; height: 20px; padding: 2px 1px 2px 3px; text-indent: -9999px; }
13-
.ui-btn-icon-notext .ui-btn-inner { padding: 0; }
12+
.ui-btn-icon-notext { width: 24px; height: 24px; text-indent: -9999px; }
13+
.ui-btn-icon-notext .ui-btn-inner { padding: 2px 1px 2px 3px; }
1414
.ui-btn-icon-notext .ui-btn-text { position: absolute; left: -999px; }
1515
.ui-btn-icon-left .ui-btn-inner { padding-left: 33px; }
1616
.ui-header .ui-btn-icon-left .ui-btn-inner,

‎themes/default/jquery.mobile.controlgroup.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
.ui-controlgroup-vertical .ui-checkbox, .ui-controlgroup-vertical .ui-radio { margin: 0; border-bottom-width: 0; }
1313
.ui-controlgroup-vertical .ui-controlgroup-last { border-bottom-width: 1px; }
1414
.ui-controlgroup-horizontal { padding: 0; }
15-
.ui-controlgroup-horizontal .ui-btn,
16-
.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { display: inline-block; margin: 0 -1px 0 0; }
17-
.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; }
15+
.ui-controlgroup-horizontal .ui-btn { display: inline-block; margin: 0 -5px 0 0; }
16+
.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; margin: 0 -1px 0 0; }
1817
.ui-controlgroup-horizontal .ui-checkbox .ui-btn, .ui-controlgroup-horizontal .ui-radio .ui-btn,
1918
.ui-controlgroup-horizontal .ui-checkbox:last-child, .ui-controlgroup-horizontal .ui-radio:last-child { margin-right: 0; }
2019
.ui-controlgroup-horizontal .ui-controlgroup-last { margin-right: 0; }

‎themes/default/jquery.mobile.forms.select.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.ui-select { display: block; position: relative; }
77
.ui-select select { position: absolute; left: -9999px; top: -9999px; }
88
.ui-select .ui-btn { overflow: hidden; }
9-
.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); }
9+
.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; }
1010
@-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }}
1111
.ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; }
1212

‎themes/default/jquery.mobile.forms.textinput.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ label.ui-input-text { font-size: 16px; line-height: 1.4; display: block; font-we
77
input.ui-input-text, textarea.ui-input-text { background-image: none; padding: .4em; line-height: 1.4; font-size: 16px; display: block; width: 95%; }
88
input.ui-input-text { -webkit-appearance: none; }
99
textarea.ui-input-text { height: 50px; -webkit-transition: height 200ms linear; -moz-transition: height 200ms linear; -o-transition: height 200ms linear; transition: height 200ms linear; }
10-
.ui-input-search { padding: 0 30px; width: 77%; background-position: 8px 50%; background-repeat: no-repeat; position: relative; }
10+
.ui-input-search { padding: 0 30px; width: 77%; background-image: none; position: relative; }
11+
.ui-icon-searchfield:after { position: absolute; left: 7px; top: 50%; margin-top: -9px; content: ""; width: 18px; height: 18px; opacity: .5; }
1112
.ui-input-search input.ui-input-text { border: none; width: 98%; padding: .4em 0; margin: 0; display: block; background: transparent none; outline: 0 !important; }
1213
.ui-input-search .ui-input-clear { position: absolute; right: 0; top: 50%; margin-top: -14px; }
1314
.ui-input-search .ui-input-clear-hidden { display: none; }

‎themes/default/jquery.mobile.listview.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
3838
.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; }
3939
.ui-li-divider .ui-li-count, .ui-li-static .ui-li-count { right: 10px; }
4040
.ui-li-has-alt .ui-li-count { right: 55px; }
41-
.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; }
42-
.ui-li-link-alt .ui-btn { overflow: hidden; position: absolute; right: 8px; top: 50%; margin: -11px 0 0 0; border-bottom-width: 1px; }
43-
.ui-li-link-alt .ui-btn-inner { padding: 0; position: static; }
41+
.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; }
42+
.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;}
43+
.ui-li-link-alt .ui-btn-inner { padding: 0; height: 100%; position: absolute; width: 100%; top: 0; left: 0;}
4444
.ui-li-link-alt .ui-btn .ui-icon { right: 50%; margin-right: -9px; }
4545

4646
.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner { border-top: 0px; }

‎themes/default/jquery.mobile.theme.css‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,8 @@ a.ui-link-inherit {
716716
/* Icons
717717
-----------------------------------------------------------------------------------------------------------*/
718718

719-
.ui-icon {
719+
.ui-icon,
720+
.ui-icon-searchfield:after {
720721
background: #666 /*{global-icon-color}*/;
721722
background: rgba(0,0,0,.4) /*{global-icon-disc}*/;
722723
background-image: url(images/icons-18-white.png) /*{global-icon-set}*/;
@@ -747,7 +748,7 @@ a.ui-link-inherit {
747748
.ui-icon-plus, .ui-icon-minus, .ui-icon-delete, .ui-icon-arrow-r,
748749
.ui-icon-arrow-l, .ui-icon-arrow-u, .ui-icon-arrow-d, .ui-icon-check,
749750
.ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back,
750-
.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search,
751+
.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search, .ui-icon-searchfield:after,
751752
.ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on {
752753
background-image: url(images/icons-36-white.png);
753754
-moz-background-size: 776px 18px;
@@ -818,7 +819,8 @@ a.ui-link-inherit {
818819
.ui-icon-home {
819820
background-position: -576px 50%;
820821
}
821-
.ui-icon-search {
822+
.ui-icon-search,
823+
.ui-icon-searchfield:after {
822824
background-position: -612px 50%;
823825
}
824826
.ui-icon-checkbox-off {
@@ -849,10 +851,6 @@ a.ui-link-inherit {
849851
.ui-radio-on .ui-icon {
850852
background-color: #4596ce /*{global-active-background-color}*/; /* NOTE: this hex should match the active state color. It's repeated here for cascade */
851853
}
852-
.ui-icon-searchfield {
853-
background-image: url(images/icon-search-black.png);
854-
background-size: 16px 16px;
855-
}
856854

857855
/* loading icon */
858856
.ui-icon-loading {

0 commit comments

Comments
 (0)