Merge pull request #3012 from mhartington/master

adamdbradley · adamdbradley · commit 99046fb1049f · 2015-02-02T21:05:11.000-06:00
fix(css): add height to item-image and fix nav-bar
diff --git a/scss/_items.scss b/scss/_items.scss
@@ -474,6 +474,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -491,6 +492,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -513,6 +515,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar.item-complex,
@@ -536,6 +539,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar-right.item-complex,
diff --git a/scss/_platform.scss b/scss/_platform.scss
@@ -33,7 +33,7 @@
     .has-subheader {
       top: $bar-height + $bar-subheader-height + $ios-statusbar-height;
     }
-    .has-tabs-top {
+    .has-header.has-tabs-top {
       top: $bar-height + $tabs-height + $ios-statusbar-height;
     }
     .has-header.has-subheader.has-tabs-top {

Original file line number	Diff line number	Diff line change
`@@ -474,6 +474,7 @@ button.item.item-button-right {`
`474`	`474`	`max-width: $item-avatar-width;`
`475`	`475`	`max-height: $item-avatar-height;`
`476`	`476`	`width: 100%;`
	`477`	`+ height: 100%;`
`477`	`478`	`border-radius: $item-avatar-border-radius;`
`478`	`479`	`}`
`479`	`480`	`}`
`@@ -491,6 +492,7 @@ button.item.item-button-right {`
`491`	`492`	`max-width: $item-avatar-width;`
`492`	`493`	`max-height: $item-avatar-height;`
`493`	`494`	`width: 100%;`
	`495`	`+ height: 100%;`
`494`	`496`	`border-radius: $item-avatar-border-radius;`
`495`	`497`	`}`
`496`	`498`	`}`
`@@ -513,6 +515,7 @@ button.item.item-button-right {`
`513`	`515`	`max-width: $item-thumbnail-width;`
`514`	`516`	`max-height: $item-thumbnail-height;`
`515`	`517`	`width: 100%;`
	`518`	`+ height: 100%;`
`516`	`519`	`}`
`517`	`520`	`}`
`518`	`521`	`.item-avatar.item-complex,`
`@@ -536,6 +539,7 @@ button.item.item-button-right {`
`536`	`539`	`max-width: $item-thumbnail-width;`
`537`	`540`	`max-height: $item-thumbnail-height;`
`538`	`541`	`width: 100%;`
	`542`	`+ height: 100%;`
`539`	`543`	`}`
`540`	`544`	`}`
`541`	`545`	`.item-avatar-right.item-complex,`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`.has-subheader {`
`34`	`34`	`top: $bar-height + $bar-subheader-height + $ios-statusbar-height;`
`35`	`35`	`}`
`36`		`- .has-tabs-top {`
	`36`	`+ .has-header.has-tabs-top {`
`37`	`37`	`top: $bar-height + $tabs-height + $ios-statusbar-height;`
`38`	`38`	`}`
`39`	`39`	`.has-header.has-subheader.has-tabs-top {`