only fix toolbar conflicts on push and reveal

Scott Jehl · Scott Jehl · commit 35b3c616d9a1 · 2012-12-18T16:52:30.000-06:00
diff --git a/css/structure/jquery.mobile.fixedToolbar.css b/css/structure/jquery.mobile.fixedToolbar.css
@@ -53,7 +53,8 @@
 .ui-android-2x-fixed .ui-li-has-thumb {
 	-webkit-transform: translate3d(0,0,0);
 }
-.ui-panel-content-wrap .ui-header-fixed {
+.ui-panel-content-wrap.ui-panel-content-wrap-display-push .ui-header-fixed,
+.ui-panel-content-wrap.ui-panel-content-wrap-display-reveal .ui-header-fixed {
 	-webkit-transform: translateY(-100%);
 }
 .ui-panel-content-wrap-closed .ui-header-fixed {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@`
`53`	`53`	`.ui-android-2x-fixed .ui-li-has-thumb {`
`54`	`54`	`-webkit-transform: translate3d(0,0,0);`
`55`	`55`	`}`
`56`		`-.ui-panel-content-wrap .ui-header-fixed {`
	`56`	`+.ui-panel-content-wrap.ui-panel-content-wrap-display-push .ui-header-fixed,`
	`57`	`+.ui-panel-content-wrap.ui-panel-content-wrap-display-reveal .ui-header-fixed {`
`57`	`58`	`-webkit-transform: translateY(-100%);`
`58`	`59`	`}`
`59`	`60`	`.ui-panel-content-wrap-closed .ui-header-fixed {`