From a82385e14c7ede73ef6893af8235f2e9e145da53 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 21 Dec 2015 23:02:41 -0800 Subject: fb --- StoneIsland/www/js/lib/nav/NavView.js | 3 +-- StoneIsland/www/js/vendor/util.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'StoneIsland/www/js') diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js index 1c12e7a1..54be5f77 100755 --- a/StoneIsland/www/js/lib/nav/NavView.js +++ b/StoneIsland/www/js/lib/nav/NavView.js @@ -146,7 +146,7 @@ var NavView = View.extend({ fb: function(){ - window.open("https://www.facebook.com/StoneIsland", '_system') + window.open(is_ios ? "facebook://profile/231623463406" : "https://www.facebook.com/StoneIsland", '_system') }, insta: function(){ window.open("https://instagram.com/stoneisland_official", '_system') @@ -155,7 +155,6 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ - console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, diff --git a/StoneIsland/www/js/vendor/util.js b/StoneIsland/www/js/vendor/util.js index e09b6ada..d45c4b98 100755 --- a/StoneIsland/www/js/vendor/util.js +++ b/StoneIsland/www/js/vendor/util.js @@ -173,6 +173,7 @@ var browser = (function( ua ) { // Naive useragent detection pattern var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) var is_ipad = (navigator.userAgent.match(/iPad/i)) +var is_ios = is_iphone || is_ipad var is_android = (navigator.userAgent.match(/Android/i)) var is_mobile = is_iphone || is_ipad || is_android var is_desktop = ! is_mobile; -- cgit v1.2.3-70-g09d2 From bed982d4cbea6752ed2fe03c3163842f2205601c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 21 Dec 2015 23:15:23 -0800 Subject: build ios --- StoneIsland/platforms/ios/www/css/account.css | 14 ++++++-- StoneIsland/platforms/ios/www/css/blogs.css | 8 +++++ StoneIsland/platforms/ios/www/css/nav.css | 40 ++++++++++++++++++---- StoneIsland/platforms/ios/www/css/products.css | 4 ++- StoneIsland/platforms/ios/www/index.html | 36 +++++-------------- .../ios/www/js/lib/account/ProfileView.js | 1 - .../platforms/ios/www/js/lib/auth/SignupView.js | 3 -- .../platforms/ios/www/js/lib/blogs/StoryView.js | 2 +- .../platforms/ios/www/js/lib/nav/NavView.js | 7 ++-- .../platforms/ios/www/js/lib/products/Selector.js | 27 +++++++++++---- StoneIsland/platforms/ios/www/js/vendor/util.js | 1 + .../www/cdv-plugin-parse.js | 0 StoneIsland/www/js/index.js | 2 +- 13 files changed, 91 insertions(+), 54 deletions(-) mode change 100755 => 100644 StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js (limited to 'StoneIsland/www/js') diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index fbb960d0..fd5ffdf6 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -172,7 +172,17 @@ input[type=text], input[type=password], input[type=number], input[type=email] { border-right: 1px solid #a9a9a9; } -.toggle-container { +#signup .toggle-container, #profile .toggle-container { + margin: 0px auto; + display: table; + margin-top: 0px; + width: calc(100vw - 10px); + box-sizing: border-box; + padding:0px 18px 2px; + font-size:14px; +} + +#settings .toggle-container { margin: 0px auto; display: table; margin-top: 10px; @@ -297,7 +307,7 @@ input.switch:checked + label:after { text-align:center; width:calc(100vw - 10px); box-sizing:border-box; - margin:10px auto; + margin:10px auto 0; position:relative } diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css index 7af45c4f..8b27dda9 100755 --- a/StoneIsland/platforms/ios/www/css/blogs.css +++ b/StoneIsland/platforms/ios/www/css/blogs.css @@ -129,6 +129,7 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } .gallery-right { @@ -150,8 +151,15 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } +@-webkit-keyframes gallery-fade { + 0%{opacity:0} + 20%{opacity:1} + 78% {opacity:1} + 100% {opacity:0} +} /* NOTE: not sure if this down arrow is necessary.. the fade might do..? what do you think? it can be removed with javascript when the body hits the bottom of diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index c769dabd..832ec46a 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -81,7 +81,7 @@ font-size: 14px; letter-spacing:1.25px; color: #bbb; - padding: 4px 0 7px 20px + padding: 4px 0 12px 20px } #nav .social { @@ -321,20 +321,46 @@ padding-bottom:0px; #selector { display: none; position: absolute; - bottom: 0; left: 0; background: #fff; z-index: 2; - width:100%; - box-sizing:border-box + box-sizing:border-box; + min-width:100px; + animation: selector-spring .15s forwards; + animation-timing-function: cubic-bezier(.43,1,.89,.95) } + +@keyframes selector-spring { + 0% { + margin-top: 15px + } + 100% { + margin-top: 0 + } +} + #selector .options div { - width: 100%; background: white; text-align: center; - padding: 8px; - + padding: 7px 12px; box-sizing:border-box; font-size: 14px; + border-left:1px solid black; + border-right:1px solid black; + border-top:1px solid black; + +} + +#selector .options div:last-of-type { + border-bottom:1px solid black +} + +.selector-full { + width: 100% !important; + box-sizing:border-box +} + +.selector-full > div > div { + padding: 12px 0 !important; } /* CONTENT */ diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index bc215573..52de76d0 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -22,6 +22,7 @@ } #product .style { text-transform: uppercase; + box-sizing:border-box } #product.loading #gallery, @@ -117,7 +118,8 @@ .product .size { padding-right:16px; - position:relative + position:relative; + box-sizing:border-box } .product .price { diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 5b949646..d6581b76 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -195,7 +195,7 @@

ARCHIVE

-
'982-'015
+
'982'015
@@ -352,7 +352,7 @@
BIRTHDAY (MM/DD/YYYY) - +

PASSWORD

@@ -383,16 +383,7 @@
- - -
- -
-
-
- +