Navbar: Fixed styling of button elements

jaspermdegroot · jaspermdegroot · commit 69b114485266 · 2014-08-25T08:57:21.000+02:00
Fixes jquery-archivegh-7606
diff --git a/css/structure/jquery.mobile.navbar.css b/css/structure/jquery.mobile.navbar.css
@@ -25,6 +25,11 @@
 	margin: 0;
 	border-right-width: 0;
 }
+.ui-header .ui-navbar li button.ui-btn,
+.ui-footer .ui-navbar li button.ui-btn {
+	margin: 0;
+	width: 100%;
+}
 .ui-navbar .ui-btn:focus {
 	z-index: 1;
 }
diff --git a/js/buttonMarkup.js b/js/buttonMarkup.js
@@ -259,7 +259,7 @@ $.fn.buttonMarkup.defaults = {
 };
 
 $.extend( $.fn.buttonMarkup, {
-	initSelector: "a:jqmData(role='button'), .ui-bar > a, .ui-bar > :jqmData(role='controlgroup') > a, button"
+	initSelector: "a:jqmData(role='button'), .ui-bar > a, .ui-bar > :jqmData(role='controlgroup') > a, button:not(:jqmData(role='navbar') button)"
 });
 
 })( jQuery );
diff --git a/js/widgets/navbar.js b/js/widgets/navbar.js
@@ -18,7 +18,7 @@ $.widget( "mobile.navbar", {
 	_create: function() {
 
 		var $navbar = this.element,
-			$navbtns = $navbar.find( "a" ),
+			$navbtns = $navbar.find( "a, button" ),
 			iconpos = $navbtns.filter( ":jqmData(icon)" ).length ? this.options.iconpos : undefined;
 
 		$navbar.addClass( "ui-navbar" )

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,11 @@`
`25`	`25`	`margin: 0;`
`26`	`26`	`border-right-width: 0;`
`27`	`27`	`}`
	`28`	`+.ui-header .ui-navbar li button.ui-btn,`
	`29`	`+.ui-footer .ui-navbar li button.ui-btn {`
	`30`	`+ margin: 0;`
	`31`	`+ width: 100%;`
	`32`	`+}`
`28`	`33`	`.ui-navbar .ui-btn:focus {`
`29`	`34`	`z-index: 1;`
`30`	`35`	`}`