Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit d8d2992

Browse files
Corner styling for dialog and popup header/content/footer. Also fixes #4277
1 parent 1103537 commit d8d2992

File tree

3 files changed

+20
-48
lines changed

3 files changed

+20
-48
lines changed

css/structure/jquery.mobile.core.css

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,27 @@ div.ui-mobile-viewport { overflow-x: hidden; }
6565
.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
6666
.ui-footer .ui-title { margin: .6em 15px .8em; }
6767

68-
/*content area*/
68+
/* content area*/
6969
.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; }
7070

71+
/* corner styling for dialogs and popups */
72+
.ui-corner-all > .ui-header:first-child,
73+
.ui-corner-all > .ui-content:first-child,
74+
.ui-corner-all > .ui-footer:first-child {
75+
-webkit-border-top-left-radius: inherit;
76+
border-top-left-radius: inherit;
77+
-webkit-border-top-right-radius: inherit;
78+
border-top-right-radius: inherit;
79+
}
80+
.ui-corner-all > .ui-header:last-child,
81+
.ui-corner-all > .ui-content:last-child,
82+
.ui-corner-all > .ui-footer:last-child {
83+
-webkit-border-bottom-left-radius: inherit;
84+
border-bottom-left-radius: inherit;
85+
-webkit-border-bottom-right-radius: inherit;
86+
border-bottom-right-radius: inherit;
87+
}
88+
7189
/* icons sizing */
7290
.ui-icon { width: 18px; height: 18px; }
7391

css/structure/jquery.mobile.popup.css

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -131,44 +131,4 @@
131131
.ui-popup > .ui-btn-left { left: -9px; }
132132
.ui-popup > .ui-btn-right { right: -9px; }
133133

134-
.ui-popup.ui-corner-all > .ui-header,
135-
.ui-popup.ui-corner-all ~ .ui-content,
136-
.ui-popup.ui-corner-all > .ui-content:first-child {
137-
-webkit-border-top-left-radius: inherit;
138-
border-top-left-radius: inherit;
139-
-webkit-border-top-right-radius: inherit;
140-
border-top-right-radius: inherit;
141-
}
142-
143-
.ui-popup.ui-corner-all > .ui-content,
144-
.ui-popup.ui-corner-all > .ui-footer,
145-
.ui-popup.ui-corner-all > .ui-header:nth-child(n):last-child {
146-
-webkit-border-bottom-left-radius: inherit;
147-
border-bottom-left-radius: inherit;
148-
-webkit-border-bottom-right-radius: inherit;
149-
border-bottom-right-radius: inherit;
150-
}
151-
152-
.ui-popup.ui-corner-all > .ui-content:nth-child(2),
153-
.ui-popup.ui-corner-all > .ui-header:nth-child(2) {
154-
-webkit-border-top-left-radius: 0;
155-
border-top-left-radius: 0;
156-
-webkit-border-top-right-radius: 0;
157-
border-top-right-radius: 0;
158-
}
159-
160-
.ui-popup.ui-corner-all > .ui-content:nth-last-child(1n+2),
161-
.ui-popup.ui-corner-all > .ui-footer:nth-last-child(1n+2) {
162-
-webkit-border-bottom-left-radius: 0;
163-
border-bottom-left-radius: 0;
164-
-webkit-border-bottom-right-radius: 0;
165-
border-bottom-right-radius: 0;
166-
}
167-
168-
.ui-popup.ui-corner-all > .ui-header:only-child,
169-
.ui-popup.ui-corner-all > .ui-footer:only-child {
170-
-webkit-border-radius: inherit;
171-
border-radius: inherit;
172-
}
173-
174134
.ui-popup-hidden { top: -99999px; left: -9999px; }

js/widgets/dialog.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
3232
.wrapInner( dialogWrap )
3333
.children()
3434
.find( ":jqmData(role='header')" )
35-
.prepend( headerCloseButton )
36-
.end()
37-
.children( ':first-child')
38-
.addClass( "ui-corner-top" )
39-
.end()
40-
.children( ":last-child" )
41-
.addClass( "ui-corner-bottom" );
35+
.prepend( headerCloseButton );
4236

4337
// this must be an anonymous function so that select menu dialogs can replace
4438
// the close method. This is a change from previously just defining data-rel=back

0 commit comments

Comments
 (0)