css/structure/jquery.mobile.core.css

@@ -216,6 +216,7 @@ div.ui-mobile-viewport {
 	font-size: 16px;
 	margin: .5em 0;
 	padding: .7em 1em;
+	border: 1px solid;
 	display: block;
 	position: relative;
 	text-align: center;

css/structure/jquery.mobile.forms.fieldcontain.css

@@ -1,6 +1,9 @@
 .ui-field-contain,
 .ui-mobile fieldset.ui-field-contain {
+	display: block;
+	position: relative;
 	overflow: visible;
+	clear: both;
 	padding: .8em 0;
 }
 .ui-field-contain > label + [class*="ui-"],
@@ -15,8 +18,8 @@
 }
 .ui-listview li.ui-field-contain:after,
 .ui-field-contain:last-child:after {
-	content: none;
-	display: none;
+	border: none;
+	box-shadow: none;
 }
 @media (min-width: 28em) {
 	.ui-field-contain,

css/themes/default/jquery.mobile.theme.css

@@ -291,7 +291,8 @@ button,
 
 /* A
 -----------------------------------------------------------------------------------------------------------*/
-
+.ui-body-a .ui-li-divider,
+html .ui-li-divider.ui-bar-a,
 .ui-bar-a {
 	background: 			#1d1d1d /*{a-bar-background-color}*/;
 	border: 1px solid 		#1b1b1b /*{a-bar-border}*/;
@@ -315,6 +316,8 @@ button,
 }
 
 .ui-body-a,
+.ui-body-a .ui-li-static,
+li.ui-li-static.ui-body-a,
 .ui-overlay-a {
 	background: 			#222 /*{a-body-background-color}*/;
 	border: 1px solid 		#1b1b1b /*{a-body-border}*/;
@@ -352,46 +355,62 @@ button,
 	font-weight: bold;
 }
 
-.ui-btn-a,
-.ui-btn-a:link,
-.ui-btn-a:visited {
+.ui-body-a .ui-btn,
+.ui-body-a .ui-btn:visited,
+html .ui-bar-a .ui-btn,
+html .ui-bar-a .ui-btn:visited,
+.ui-mobile .ui-btn.ui-btn-a,
+.ui-mobile .ui-btn.ui-btn-a:visited {
 	background: 			#2a2a2a /*{a-bup-background-color}*/;
-	border: 1px solid 		#1b1b1b /*{a-bup-border}*/;
+	border-color: 			#1b1b1b /*{a-bup-border}*/;
 	color: 					#fff /*{a-bup-color}*/;
 	text-shadow: 0 /*{a-bup-shadow-x}*/ 1px /*{a-bup-shadow-y}*/ 0 /*{a-bup-shadow-radius}*/ #000 /*{a-bup-shadow-color}*/;
 	font-weight: bold;
 }
-.ui-btn-a:hover {
+.ui-body-a .ui-btn:hover,
+html .ui-bar-a .ui-btn:hover,
+.ui-mobile .ui-btn.ui-btn-a:hover {
 	background: 			#333 /*{a-bhover-background-color}*/;
-	border: 1px solid 		#222 /*{a-bhover-border}*/;
+	border-color:	 		#222 /*{a-bhover-border}*/;
 	color: 					#fff /*{a-bhover-color}*/;
 	text-shadow: 0 /*{a-bhover-shadow-x}*/ 1px /*{a-bhover-shadow-y}*/ 0 /*{a-bhover-shadow-radius}*/ #000 /*{a-bhover-shadow-color}*/;
 }
-.ui-btn-a:active {
+.ui-body-a .ui-btn:active,
+html .ui-bar-a .ui-btn:active,
+.ui-mobile .ui-btn.ui-btn-a:active {
 	background: 			#2d2d2d /*{a-bdown-background-color}*/;
-	border: 1px solid 		#222 /*{a-bdown-border}*/;
+	border-color:	 		#222 /*{a-bdown-border}*/;
 	color: 					#fff /*{a-bdown-color}*/;
 	text-shadow: 0 /*{a-bdown-shadow-x}*/ 1px /*{a-bdown-shadow-y}*/ 0 /*{a-bdown-shadow-radius}*/ #000 /*{a-bdown-shadow-color}*/;
 }
-
-.ui-btn-a.ui-btn-active {
+.ui-body-a .ui-btn.ui-btn-active,
+html .ui-bar-a .ui-btn.ui-btn-active,
+.ui-mobile .ui-btn.ui-btn-a.ui-btn-active {
 	background: 			#34bae8 /*{a-bactive-background-color}*/;
-	border: 1px solid 		#3399cc /*{a-bactive-border}*/;
+	border-color:	 		#3399cc /*{a-bactive-border}*/;
 	color: 					#fff /*{a-bactive-color}*/;
 	text-shadow: 0 /*{a-bactive-shadow-x}*/ 1px /*{a-bactive-shadow-y}*/ 0 /*{a-bactive-shadow-radius}*/ #3399cc /*{a-bactive-shadow-color}*/;
 	cursor: pointer;
 }
 
-.ui-btn-a:focus,
-.ui-btn-a.ui-focus,
-.ui-body-a.ui-focus {
+.ui-body-a .ui-btn:focus,
+.ui-body-a .ui-focus,
+html .ui-bar-a .ui-btn:focus,
+html .ui-bar-a .ui-focus,
+.ui-mobile .ui-btn-a:focus,
+.ui-mobile .ui-btn-a.ui-focus,
+.ui-mobile .ui-body-a.ui-focus {
 	-webkit-box-shadow: 0 0 12px 	#34bae8 /*{a-bactive-background-color}*/;
 	-moz-box-shadow: 0 0 12px 		#34bae8 /*{a-bactive-background-color}*/;
 	box-shadow: 0 0 12px 			#34bae8 /*{a-bactive-background-color}*/;
 }
 
-.ui-btn-a.ui-icon-checkbox-on:after,
-.ui-btn-a.ui-icon-radio-on:after {
+.ui-body-a .ui-icon-checkbox-on:after,
+.ui-body-a .ui-icon-radio-on:after,
+html .ui-bar-a .ui-icon-checkbox-on:after,
+html .ui-bar-a .ui-icon-radio-on:after,
+.ui-mobile .ui-btn-a.ui-icon-checkbox-on:after,
+.ui-mobile .ui-btn-a.ui-icon-radio-on:after {
 	background-color: #34bae8 /*{a-bactive-background-color}*/;
 }
 
@@ -406,6 +425,8 @@ button,
 /* B
 -----------------------------------------------------------------------------------------------------------*/
 
+.ui-body-b .ui-li-divider,
+html .ui-li-divider.ui-bar-b,
 .ui-bar-b {
 	background: 			#e5e5e5 /*{b-bar-background-color}*/;
 	border: 1px solid 		#ddd /*{b-bar-border}*/;
@@ -429,6 +450,8 @@ button,
 }
 
 .ui-body-b,
+.ui-body-b .ui-li-static,
+li.ui-li-static.ui-body-b,
 .ui-overlay-b {
 	background: 			#f5f5f5 /*{b-body-background-color}*/;
 	border: 1px solid 		#ddd /*{b-body-border}*/;
@@ -466,46 +489,62 @@ button,
 	font-weight: bold;
 }
 
-.ui-btn-b,
-.ui-btn-b:link,
-.ui-btn-b:visited {
+.ui-body-b .ui-btn,
+.ui-body-b .ui-btn:visited,
+html .ui-bar-b .ui-btn,
+html .ui-bar-b .ui-btn:visited,
+.ui-mobile .ui-btn.ui-btn-b,
+.ui-mobile .ui-btn.ui-btn-b:visited {
 	background: 			#efefef /*{b-bup-background-color}*/;
-	border: 1px solid 		#ddd /*{b-bup-border}*/;
+	border-color:	 		#ddd /*{b-bup-border}*/;
 	color: 					#333 /*{b-bup-color}*/;
 	text-shadow: 0 /*{b-bup-shadow-x}*/ 1px /*{b-bup-shadow-y}*/ 0 /*{b-bup-shadow-radius}*/ #fff /*{b-bup-shadow-color}*/;
 	font-weight: bold;
 }
-.ui-btn-b:hover {
+.ui-body-b .ui-btn:hover,
+html .ui-bar-b .ui-btn:hover,
+.ui-mobile .ui-btn.ui-btn-b:hover {
 	background: 			#e9e9e9 /*{b-bhover-background-color}*/;
-	border: 1px solid 		#d5d5d5 /*{b-bhover-border}*/;
+	border-color:	 		#d5d5d5 /*{b-bhover-border}*/;
 	color: 					#333 /*{b-bhover-color}*/;
 	text-shadow: 0 /*{b-bhover-shadow-x}*/ 1px /*{b-bhover-shadow-y}*/ 0 /*{b-bhover-shadow-radius}*/ #fff /*{b-bhover-shadow-color}*/;
 }
-.ui-btn-b:active {
+.ui-body-b .ui-btn:hover,
+html .ui-bar-b .ui-btn:hover,
+.ui-mobile .ui-btn.ui-btn-b:hover {
 	background: 			#e3e3e3 /*{b-bdown-background-color}*/;
-	border: 1px solid 		#d5d5d5 /*{b-bdown-border}*/;
+	border-color:	 		#d5d5d5 /*{b-bdown-border}*/;
 	color: 					#333 /*{b-bdown-color}*/;
 	text-shadow: 0 /*{b-bdown-shadow-x}*/ 1px /*{b-bdown-shadow-y}*/ 0 /*{b-bdown-shadow-radius}*/ #fff /*{b-bdown-shadow-color}*/;
 }
-
-.ui-btn-b.ui-btn-active {
+.ui-body-b .ui-btn.ui-btn-active,
+htm .ui-bar-b .ui-btn.ui-btn-active,
+.ui-mobile .ui-btn.ui-btn-b.ui-btn-active {
 	background: 			#ff0066 /*{b-bactive-background-color}*/;
-	border: 1px solid 		#cc0066 /*{b-bactive-border}*/;
+	border-color:	 		#cc0066 /*{b-bactive-border}*/;
 	color: 					#fff /*{b-bactive-color}*/;
 	text-shadow: 0 /*{b-bactive-shadow-x}*/ 1px /*{b-bactive-shadow-y}*/ 0 /*{b-bactive-shadow-radius}*/ #cc0066 /*{b-bactive-shadow-color}*/;
 	cursor: pointer;
 }
 
-.ui-btn-b:focus,
-.ui-btn-b.ui-focus,
-.ui-body-b.ui-focus {
+.ui-body-b .ui-btn:focus,
+.ui-body-b .ui-focus,
+html .ui-bar-b .ui-btn:focus,
+html .ui-bar-b .ui-focus,
+.ui-mobile .ui-btn-b:focus,
+.ui-mobile .ui-btn-b.ui-focus,
+.ui-mobile .ui-body-b.ui-focus {
 	-webkit-box-shadow: 0 0 12px 	#ff0066 /*{b-bactive-background-color}*/;
 	-moz-box-shadow: 0 0 12px 		#ff0066 /*{b-bactive-background-color}*/;
 	box-shadow: 0 0 12px 			#ff0066 /*{b-bactive-background-color}*/;
 }
 
-.ui-btn-b.ui-icon-checkbox-on:after,
-.ui-btn-b.ui-icon-radio-on:after {
+.ui-body-b .ui-icon-checkbox-on:after,
+.ui-body-b .ui-icon-radio-on:after,
+html .ui-bar-b .ui-icon-checkbox-on:after,
+html .ui-bar-b .ui-icon-radio-on:after,
+.ui-mobile .ui-btn-b.ui-icon-checkbox-on:after,
+.ui-mobile .ui-btn-b.ui-icon-radio-on:after {
 	background-color: #ff0066 /*{b-bactive-background-color}*/;
 }
 

js/jquery.mobile.buttonMarkup.js

@@ -211,7 +211,7 @@ $.fn.buttonMarkup = function( options, overwriteClasses ) {
 $.fn.buttonMarkup.defaults = {
 	icon: "",
 	iconpos: "right",
-	theme: "a",
+	theme: null,
 	inline: false,
 	shadow: true,
 	corners: true,

js/jquery.mobile.fieldContain.js

@@ -9,8 +9,9 @@ define( [ "jquery", "jquery.mobile.registry" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
+// Deprecated in 1.4
 $.fn.fieldcontain = function(/* options */) {
-	return this.addClass( "ui-field-contain ui-body" );
+	return this.addClass( "ui-field-contain" );
 };
 
 //auto self-init widgets

js/widgets/forms/button.js

@@ -95,10 +95,9 @@ $.widget( "mobile.button", $.mobile.widget, {
 			$el = this.element,
 			classes = "";
 
-		if ( !o.theme ) {
-			 o.theme = "a";
+		if ( o.theme ) {
+			 classes += "ui-btn-" + o.theme;
 		}
-		classes += "ui-btn-" + o.theme;
 
 		if ( o.corners ) {
 			classes += " ui-corner-all";

js/widgets/forms/checkboxradio.js

@@ -46,10 +46,6 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, $.extend( {
 		}
 
 		// Establish options
-		// If there's no selected theme check the data attr
-		if ( !o.theme ) {
-			o.theme = "a";
-		}
 		o.mini = inheritAttr( input, "mini" ) || o.mini;
 
 		// Expose for other methods
@@ -201,7 +197,9 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, $.extend( {
 	},
 
 	_setTheme: function( value ) {
-		this.label.removeClass( "ui-btn-" + this.options.theme ).addClass( "ui-btn-" + value );
+		if ( value ) {
+			this.label.removeClass( "ui-btn-" + this.options.theme ).addClass( "ui-btn-" + value );
+		}
 	},
 
 	_setMini: function( value ) {

js/widgets/forms/select.js

@@ -79,9 +79,6 @@ $.widget( "mobile.selectmenu", $.mobile.widget, $.extend( {
 		this.selectID  = this.select.attr( "id" );
 		this.label = $( "label[for='"+ this.selectID +"']" );
 		this.isMultiple = this.select[ 0 ].multiple;
-		if ( !this.options.theme ) {
-			this.options.theme = "a";
-		}
 	},
 
 	_destroy: function() {
@@ -114,12 +111,13 @@ $.widget( "mobile.selectmenu", $.mobile.widget, $.extend( {
 			// TODO values buttonId and menuId are undefined here
 			button = this.button
 				.insertBefore( this.select )
-				.addClass( "ui-btn ui-btn-" + ( options.theme || "a" ) +
+				.addClass( "ui-btn" +
 					( options.icon ?
 						( " ui-icon-" + options.icon + " ui-btn-icon-" + iconpos + ( options.iconshadow ?
 							" ui-shadow-icon" :
 								"" ) ) :
 						"" ) +
+					( options.theme ? " ui-btn-" + options.theme : "" ) +
 					( options.corners ? " ui-corner-all" : "" ) +
 					( options.shadow ? " ui-shadow" : "" ) );
 
@@ -185,9 +183,6 @@ $.widget( "mobile.selectmenu", $.mobile.widget, $.extend( {
 			.bind( "change blur vmouseout", function() {
 				self.button.trigger( "vmouseout" )
 					.removeClass( $.mobile.activeBtnClass );
-			})
-			.bind( "change blur", function() {
-				self.button.removeClass( "ui-btn-down-" + self.options.theme );
 			});
 
 		// In many situations, iOS will zoom into the select upon tap, this prevents that from happening