diff --git a/scss/_platform.scss b/scss/_platform.scss index 8b4a66f9ee..3d67099d5c 100644 --- a/scss/_platform.scss +++ b/scss/_platform.scss @@ -96,39 +96,39 @@ */ //} -.platform-ios7.platform-cordova { - // iOS7 has a status bar which sits on top of the header. +.platform-ios.platform-cordova { + // iOS7/8 has a status bar which sits on top of the header. // Bump down everything to make room for it. However, if // if its in Cordova, and set to fullscreen, then disregard the bump. &:not(.fullscreen) { .bar-header:not(.bar-subheader) { - height: $bar-height + $ios7-statusbar-height; + height: $bar-height + $ios-statusbar-height; &.item-input-inset .item-input-wrapper { margin-top: 19px !important; } > * { - margin-top: $ios7-statusbar-height; + margin-top: $ios-statusbar-height; } } .tabs-top > .tabs, .tabs.tabs-top { - top: $bar-height + $ios7-statusbar-height; + top: $bar-height + $ios-statusbar-height; } .has-header, .bar-subheader { - top: $bar-height + $ios7-statusbar-height; + top: $bar-height + $ios-statusbar-height; } .has-subheader { - top: (2 * $bar-height) + $ios7-statusbar-height; + top: (2 * $bar-height) + $ios-statusbar-height; } .has-tabs-top { - top: $bar-height + $tabs-height + $ios7-statusbar-height; + top: $bar-height + $tabs-height + $ios-statusbar-height; } .has-header.has-subheader.has-tabs-top { - top: 2 * $bar-height + $tabs-height + $ios7-statusbar-height; + top: 2 * $bar-height + $tabs-height + $ios-statusbar-height; } } &.status-bar-hide { @@ -138,7 +138,7 @@ } @media (orientation:landscape) { - .platform-ios7.platform-browser.platform-ipad { + .platform-ios.platform-browser.platform-ipad { position: fixed; // required for iPad 7 Safari } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 8e5310db88..b56d834a0f 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -684,4 +684,4 @@ $z-index-view: 1 !default; // Platform // ------------------------------- -$ios7-statusbar-height: 20px !default; +$ios-statusbar-height: 20px !default; diff --git a/test/css/headers-ios.html b/test/css/headers-ios.html new file mode 100644 index 0000000000..faace66732 --- /dev/null +++ b/test/css/headers-ios.html @@ -0,0 +1,106 @@ + + + + + + Header + + + + + + + + +
+ Back +

Really really really really really really really really long title!

+ Home +
+ +
+ Home +
+ First + Second + Third +
+ + Favorites + +
+ +
+ Home +
+ First + Second + Third +
+ + Favorites + +
+ +
+ Back +
+ First + Second + Third +
+ + Favorites + +
+ +
+ Back +
+ First + Second + Third +
+ + Favorites + +
+ +
+ +
+ Edit + Teach + Delete +
+ + + +
+ +
+ +
+ First + Second + Third +
+ + + +
+ +
+ +

Title here

+
+ + + + + diff --git a/test/html/status-bar-toggles.html b/test/html/status-bar-toggles.html new file mode 100644 index 0000000000..e914e1cee2 --- /dev/null +++ b/test/html/status-bar-toggles.html @@ -0,0 +1,146 @@ + + + + + Status Bar + + + + + + + + +
Fake iOS Status Bar
+ +
+ Back +

Status Bar

+ Home +
+ +
+ +

fullScreen: function(showFullScreen, showStatusBar)

+ +

Body Class: {{ bodyClass }}

+ +

isFullScreen: {{ isFullScreen }}

+ +

_showStatusBar: {{ _showStatusBar }}

+ +

+ + + + + + + +

+ +

+ + + +

+ +
+ + + \ No newline at end of file