From a6b00e7895197c33d401d7368dda9f109c9e52af Mon Sep 17 00:00:00 2001
From: Jasper de Groot <mail@ugomobi.com>
Date: Thu, 14 Aug 2014 20:19:53 +0200
Subject: [PATCH] Navbar: Fixed styling of button elements

Fixes gh-7606
---
 css/structure/jquery.mobile.navbar.css | 5 +++++
 js/jquery.mobile.buttonMarkup.js       | 2 +-
 js/widgets/navbar.js                   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/css/structure/jquery.mobile.navbar.css b/css/structure/jquery.mobile.navbar.css
index ab6f4290459..ebfe02327d1 100644
--- 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
index 71aea7bbbf3..0de35ea3eb9 100644
--- 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
index 2b2174b0a64..25907b6d327 100644
--- 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" )