Permalink
Browse files

changed the dialog wrapper and page classes so that the page element …

…still has the ui-dialog class. The inner wrapper now has a class of ui-dialog-contain. The recently added (post 1.0) class ui-dialog-page is no longer in use.
  • Loading branch information...
1 parent dfccb1d commit 2918f18123d97fb80e25d59baf3b64786867922b scottjehl committed Feb 27, 2012
@@ -1,7 +1,7 @@
-.ui-dialog { width: 92.5%; max-width: 500px; margin: 10% auto 15px auto; padding: 0; }
-.ui-dialog-page {
+.ui-dialog {
background: none !important; /* this is to ensure that dialog theming does not apply (by default at least) on the page div */
}
+.ui-dialog-contain { width: 92.5%; max-width: 500px; margin: 10% auto 15px auto; padding: 0; }
.ui-dialog .ui-header {
margin-top: 15%;
}
@@ -5,7 +5,7 @@
-webkit-box-shadow: 0 0 20px rgba(0,0,0,.4);
-moz-box-shadow: 0 0 20px rgba(0,0,0,.4);
}
-.ui-dialog-page.flow {
+.ui-dialog.flow {
-webkit-transform-origin: none;
-moz-transform-origin: none;
-webkit-box-shadow: none;
@@ -18,10 +18,10 @@ $.widget( "mobile.dialog", $.mobile.widget, {
headerCloseButton = $( "<a href='#' data-" + $.mobile.ns + "icon='delete' data-" + $.mobile.ns + "iconpos='notext'>"+ this.options.closeBtnText + "</a>" ),
dialogWrap = $("<div/>", {
"role" : "dialog",
- "class" : "ui-dialog ui-corner-all ui-overlay-shadow"
+ "class" : "ui-dialog-contain ui-corner-all ui-overlay-shadow"
});
- $el.addClass( "ui-dialog-page ui-overlay-" + this.options.overlayTheme );
+ $el.addClass( "ui-dialog ui-overlay-" + this.options.overlayTheme );
// Class the markup for dialog styling
// Set aria role
@@ -69,7 +69,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
// if there's an overlay theme, we're going to remove it from the page container.
// First though, check that the incoming page isn't a dialog with the same theme. If so, don't remove.
if( self.options.overlayTheme ){
- if( !ui.nextPage || !ui.nextPage.is( ".ui-dialog-page.ui-overlay-" + self.options.overlayTheme ) ){
+ if( !ui.nextPage || !ui.nextPage.is( ".ui-dialog.ui-overlay-" + self.options.overlayTheme ) ){
$.mobile.pageContainer.removeClass( "ui-overlay-" + self.options.overlayTheme );
}
}
@@ -1384,7 +1384,7 @@ define( [
// If current active page is not a dialog skip the dialog and continue
// in the same direction
- if(!$.mobile.activePage.is( ".ui-dialog-page" )) {
+ if(!$.mobile.activePage.is( ".ui-dialog" )) {
//determine if we're heading forward or backward and continue accordingly past
//the current dialog
urlHistory.directHashChange({

0 comments on commit 2918f18

Please sign in to comment.