Merge pull request #4215 from gaetansenn/patch-1

mlynch · mlynch · commit 0adf975bbd72 · 2015-12-06T15:40:19.000-06:00
Add Subfooter with tabs support
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss
@@ -236,6 +236,10 @@ ion-infinite-scroll {
   }
 }
 
+.bar-subfooter.has-tabs {
+  bottom: $tabs-height + $bar-footer-height;
+}
+
 .has-footer.has-tabs {
   bottom: $tabs-height + $bar-footer-height;
 }

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,10 @@ ion-infinite-scroll {`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
	`239`	`+.bar-subfooter.has-tabs {`
	`240`	`+ bottom: $tabs-height + $bar-footer-height;`
	`241`	`+}`
	`242`	`+`
`239`	`243`	`.has-footer.has-tabs {`
`240`	`244`	`bottom: $tabs-height + $bar-footer-height;`
`241`	`245`	`}`