Skip to content

Commit 566c785

Browse files
committed
Moved .ui-dialog to element wrapping dialog header/content/footer, switched overlay non-theming class to .ui-dialog-page.
1 parent e025fa5 commit 566c785

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
color: #2489CE /*{a-bar-link-visited}*/;
4545
}
4646
.ui-body-a,
47-
.ui-dialog.ui-overlay-a {
47+
.ui-dialog-page.ui-overlay-a {
4848
border: 1px solid #2A2A2A /*{a-body-border}*/;
4949
background: #222222 /*{a-body-background-color}*/;
5050
color: #fff /*{a-body-color}*/;
@@ -184,7 +184,7 @@
184184
color: #ddf0f8 /*{b-bar-link-visited}*/;
185185
}
186186
.ui-body-b,
187-
.ui-dialog.ui-overlay-b {
187+
.ui-dialog-page.ui-overlay-b {
188188
border: 1px solid #C6C6C6 /*{b-body-border}*/;
189189
background: #cccccc /*{b-body-background-color}*/;
190190
color: #333333 /*{b-body-color}*/;
@@ -326,7 +326,7 @@
326326
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
327327
}
328328
.ui-body-c,
329-
.ui-dialog.ui-overlay-c {
329+
.ui-dialog-page.ui-overlay-c {
330330
border: 1px solid #B3B3B3 /*{c-body-border}*/;
331331
color: #333333 /*{c-body-color}*/;
332332
text-shadow: 0 /*{c-body-shadow-x}*/ 1px /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ #fff /*{c-body-shadow-color}*/;
@@ -468,7 +468,7 @@
468468
}
469469

470470
.ui-body-d,
471-
.ui-dialog.ui-overlay-d {
471+
.ui-dialog-page.ui-overlay-d {
472472
border: 1px solid #ccc /*{d-body-border}*/;
473473
color: #333333 /*{d-body-color}*/;
474474
text-shadow: 0 /*{d-body-shadow-x}*/ 1px /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ #fff /*{d-body-shadow-color}*/;
@@ -609,7 +609,7 @@
609609
}
610610

611611
.ui-body-e,
612-
.ui-dialog.ui-overlay-e {
612+
.ui-dialog-page.ui-overlay-e {
613613
border: 1px solid #F7C942 /*{e-body-border}*/;
614614
color: #333333 /*{e-body-color}*/;
615615
text-shadow: 0 /*{e-body-shadow-x}*/ 1px /*{e-body-shadow-y}*/ 0 /*{e-body-shadow-radius}*/ #fff /*{e-body-shadow-color}*/;

js/jquery.mobile.dialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
1919
"class" : "ui-dialog ui-corner-all ui-overlay-shadow"
2020
});
2121

22-
$el.addClass( "ui-overlay-" + this.options.overlayTheme );
22+
$el.addClass( "ui-dialog-page ui-overlay-" + this.options.overlayTheme );
2323

2424
// Class the markup for dialog styling
2525
// Set aria role

tests/unit/dialog/dialog_events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ok( /&ui-state=dialog/.test(location.hash), "ui-state=dialog =~ location.hash", "dialog open" );
2929

3030
// close the dialog
31-
$( ".ui-dialog" ).dialog( "close" );
31+
$( ".ui-dialog-page" ).dialog( "close" );
3232
},
3333

3434
function() {

tests/unit/navigation/navigation_core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@
10621062
},
10631063

10641064
function() {
1065-
ok( $.mobile.activePage.is(".ui-dialog"), "prefetched page is rendered as a dialog" );
1065+
ok( $.mobile.activePage.is(".ui-dialog-page"), "prefetched page is rendered as a dialog" );
10661066
start();
10671067
}
10681068
]);

0 commit comments

Comments
 (0)