Navbar: Fixed styling of button elements

Fixes gh-7606
jquery-archive · Aug 25, 2014 · a6b00e7 · a6b00e7
1 parent 516b791
commit a6b00e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.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" )