diff --git a/js/platform.js b/js/platform.js index ddb36191b0..ed6f2dd847 100644 --- a/js/platform.js +++ b/js/platform.js @@ -25,7 +25,9 @@ // Check if we are running in Cordova, which will have // window.device available. isCordova: function() { - return 'device' in window; + return (window.cordova || window.PhoneGap || window.phonegap); + //&& /^file:\/{3}[^\/]/i.test(window.location.href) + //&& /ios|iphone|ipod|ipad|android/i.test(navigator.userAgent); }, isIOS7: function() { if(!window.device) { diff --git a/scss/_ios7.scss b/scss/_ios7.scss new file mode 100644 index 0000000000..182f2cdb9f --- /dev/null +++ b/scss/_ios7.scss @@ -0,0 +1,14 @@ +.platform-ios7 { + .bar { + height: 64px; + + .title { + line-height: 84px; + } + } + + .has-header { + top: 64px; + } +} + diff --git a/scss/ionic.scss b/scss/ionic.scss index 55a14f3d7c..d5305a103a 100644 --- a/scss/ionic.scss +++ b/scss/ionic.scss @@ -5,6 +5,8 @@ "mixins", "variables", + "ios7", + // Base "ionic/reset", "ionic/scaffolding", diff --git a/scss/ionic/_bar.scss b/scss/ionic/_bar.scss index 9b851318ea..78df5ee2f4 100644 --- a/scss/ionic/_bar.scss +++ b/scss/ionic/_bar.scss @@ -188,4 +188,3 @@ bottom: $bar-height; display: block; } -