Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
This commit is contained in:
commit
f80e4dd2a6
@ -1316,6 +1316,11 @@ html[xmlns] .clearfix {
|
||||
height: 44px;
|
||||
background-size: 44px;
|
||||
}
|
||||
.ios7 .nav {
|
||||
background: url(/assets/images/nav-ios7.png);
|
||||
background-size: 54px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.bg {
|
||||
background: #f5f5f5 url(/assets/images/crisp_paper_ruffles-mobile.png);
|
||||
}
|
||||
|
||||
BIN
www/assets/images/nav-ios7.png
Normal file
BIN
www/assets/images/nav-ios7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
@ -45,9 +45,13 @@ var App = {
|
||||
useCompleteAddress : false, /* if true it means the address field will be fill with the address found by google api */
|
||||
completeAddressWithZipCode : true,
|
||||
boundingBoxMeters : 8000,
|
||||
localStorage: false
|
||||
localStorage: false,
|
||||
isPhoneGap: document.location.protocol == 'file:'
|
||||
};
|
||||
|
||||
// enable localstorage on phonegap
|
||||
App.localStorage = App.isPhoneGap;
|
||||
|
||||
|
||||
App.alert = function(txt) {
|
||||
setTimeout(function() {
|
||||
@ -500,6 +504,11 @@ App.trigger = {
|
||||
*/
|
||||
$(function() {
|
||||
FastClick.attach(document.body);
|
||||
|
||||
if (App.isPhoneGap && App.iOS7()) {
|
||||
$('body').addClass('ios7');
|
||||
}
|
||||
|
||||
App.snap = new Snap({
|
||||
element: document.getElementById('snap-content'),
|
||||
disable: 'right'
|
||||
|
||||
@ -27,6 +27,10 @@ App.iOS = function(){
|
||||
return /ipad|iphone|ipod/i.test( navigator.userAgent.toLowerCase() );
|
||||
}
|
||||
|
||||
App.iOS7 = function(){
|
||||
return /iphone os 7_/i.test( navigator.userAgent.toLowerCase() );
|
||||
}
|
||||
|
||||
App.isAndroid = function(){
|
||||
return /android/i.test( navigator.userAgent.toLowerCase() );
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user