mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-04-22 15:14:44 +00:00
Moved .ui-dialog to element wrapping dialog header/content/footer, switched overlay non-theming class to .ui-dialog-page.
This commit is contained in:
parent
eb9968c2b6
commit
20b0434207
4 changed files with 8 additions and 8 deletions
|
|
@ -60,7 +60,7 @@
|
|||
color: #2489CE /*{a-bar-link-visited}*/;
|
||||
}
|
||||
.ui-body-a,
|
||||
.ui-dialog.ui-overlay-a {
|
||||
.ui-dialog-page.ui-overlay-a {
|
||||
border: 1px solid #2A2A2A /*{a-body-border}*/;
|
||||
background: #222222 /*{a-body-background-color}*/;
|
||||
color: #fff /*{a-body-color}*/;
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
color: #ddf0f8 /*{b-bar-link-visited}*/;
|
||||
}
|
||||
.ui-body-b,
|
||||
.ui-dialog.ui-overlay-b {
|
||||
.ui-dialog-page.ui-overlay-b {
|
||||
border: 1px solid #C6C6C6 /*{b-body-border}*/;
|
||||
background: #cccccc /*{b-body-background-color}*/;
|
||||
color: #333333 /*{b-body-color}*/;
|
||||
|
|
@ -342,7 +342,7 @@
|
|||
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
|
||||
}
|
||||
.ui-body-c,
|
||||
.ui-dialog.ui-overlay-c {
|
||||
.ui-dialog-page.ui-overlay-c {
|
||||
border: 1px solid #B3B3B3 /*{c-body-border}*/;
|
||||
color: #333333 /*{c-body-color}*/;
|
||||
text-shadow: 0 /*{c-body-shadow-x}*/ 1px /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ #fff /*{c-body-shadow-color}*/;
|
||||
|
|
@ -484,7 +484,7 @@
|
|||
}
|
||||
|
||||
.ui-body-d,
|
||||
.ui-dialog.ui-overlay-d {
|
||||
.ui-dialog-page.ui-overlay-d {
|
||||
border: 1px solid #ccc /*{d-body-border}*/;
|
||||
color: #333333 /*{d-body-color}*/;
|
||||
text-shadow: 0 /*{d-body-shadow-x}*/ 1px /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ #fff /*{d-body-shadow-color}*/;
|
||||
|
|
@ -625,7 +625,7 @@
|
|||
}
|
||||
|
||||
.ui-body-e,
|
||||
.ui-dialog.ui-overlay-e {
|
||||
.ui-dialog-page.ui-overlay-e {
|
||||
border: 1px solid #F7C942 /*{e-body-border}*/;
|
||||
color: #333333 /*{e-body-color}*/;
|
||||
text-shadow: 0 /*{e-body-shadow-x}*/ 1px /*{e-body-shadow-y}*/ 0 /*{e-body-shadow-radius}*/ #fff /*{e-body-shadow-color}*/;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
|
|||
"class" : "ui-dialog ui-corner-all ui-overlay-shadow"
|
||||
});
|
||||
|
||||
$el.addClass( "ui-overlay-" + this.options.overlayTheme );
|
||||
$el.addClass( "ui-dialog-page ui-overlay-" + this.options.overlayTheme );
|
||||
|
||||
// Class the markup for dialog styling
|
||||
// Set aria role
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
ok( /&ui-state=dialog/.test(location.hash), "ui-state=dialog =~ location.hash", "dialog open" );
|
||||
|
||||
// close the dialog
|
||||
$( ".ui-dialog" ).dialog( "close" );
|
||||
$( ".ui-dialog-page" ).dialog( "close" );
|
||||
},
|
||||
|
||||
function() {
|
||||
|
|
|
|||
|
|
@ -1062,7 +1062,7 @@
|
|||
},
|
||||
|
||||
function() {
|
||||
ok( $.mobile.activePage.is(".ui-dialog"), "prefetched page is rendered as a dialog" );
|
||||
ok( $.mobile.activePage.is(".ui-dialog-page"), "prefetched page is rendered as a dialog" );
|
||||
start();
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
Loading…
Reference in a new issue