diff options
22 files changed, 85 insertions, 31 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index a2ed92a7..78679711 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2017-02-24T01:01:47Z</date> + <date>2017-02-24T01:59:21Z</date> <key>Name</key> <string>Stone Island</string> <key>SchemeName</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib Binary files differindex 601432ff..49f9f34b 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib Binary files differindex b9b60ccd..d621455d 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib Binary files differindex d1edc0e4..9b0d2a83 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island Binary files differindex 3cdc5562..3cef3c77 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index 6a5b916f..1fe9e719 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -86,7 +86,7 @@ </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - lJ4/WwYt6uJAlE8dRuGJoQUHBtE= + F0S7TexfDuNcAIzVC0uHjKsmET0= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -94,7 +94,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - bq+Wgd651U1u1OvRVeqVhIQxlRo= + vORlPdcjEZgAzfO+BhiOTHzi4JM= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -162,7 +162,7 @@ </data> <key>MainViewController.nib</key> <data> - R2z/cNf0vp63r/U6XFEkt1AuGqU= + wTYhtGVBbIMGFBn5QdXdfDpUx90= </data> <key>PkgInfo</key> <data> @@ -198,7 +198,7 @@ </data> <key>www/css/account.css</key> <data> - x1JyR8RqF2Srvb1EYX88l+Wz5qA= + iqX2jg1B1fMIoMZ9UDOmdeXY5R4= </data> <key>www/css/blogs.css</key> <data> @@ -266,7 +266,7 @@ </data> <key>www/css/nav.css</key> <data> - aCFlsZzgMtbv6Z6bkKwkakJFAdo= + 4hSh6NJLuzHKgsQdhOHFsDdrYzw= </data> <key>www/css/products.css</key> <data> @@ -382,7 +382,7 @@ </data> <key>www/index.html</key> <data> - qsauVM0WF8MlOnPraEK8ZDT+5IE= + Cqs564HHydS1cajG/YyUxH/m/qQ= </data> <key>www/js/index.js</key> <data> @@ -406,7 +406,7 @@ </data> <key>www/js/lib/account/ProfileView.js</key> <data> - NJ8cYUUHtA916ySMroE/5GaEc+M= + g81ByC4WQ4lAdrDltz7b/C/MqNY= </data> <key>www/js/lib/account/SettingsView.js</key> <data> @@ -562,7 +562,7 @@ </data> <key>www/js/lib/view/Serializable.js</key> <data> - 1axFnf92uYJ5GPvZdeKU+zPGLuw= + TZu3vDiiaHeg3ApJ+HZowCDsPvE= </data> <key>www/js/lib/view/View.js</key> <data> @@ -939,11 +939,11 @@ <dict> <key>hash</key> <data> - lJ4/WwYt6uJAlE8dRuGJoQUHBtE= + F0S7TexfDuNcAIzVC0uHjKsmET0= </data> <key>hash2</key> <data> - k1N5634DLVygqKVPGzBmfszWGNXrc4yRJRC7WskQe1c= + rcFs3zbiTZtSodlJieh1YqEh5Kyq0jxSEbsSeAUGshk= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -961,11 +961,11 @@ <dict> <key>hash</key> <data> - bq+Wgd651U1u1OvRVeqVhIQxlRo= + vORlPdcjEZgAzfO+BhiOTHzi4JM= </data> <key>hash2</key> <data> - trOU+wAUHaPJSTtks1FRozVON5LpBVE4kPQsj0L2ACI= + u3DPlANtTEMpU6qgkLJcWUhA0ryCmwgNg2jm9sO9ARg= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1137,11 +1137,11 @@ <dict> <key>hash</key> <data> - R2z/cNf0vp63r/U6XFEkt1AuGqU= + wTYhtGVBbIMGFBn5QdXdfDpUx90= </data> <key>hash2</key> <data> - KbPVXadqHny64bPg9n6F2VliNyiuZpProeyxTZI0GCc= + aoZOoHUqnPGpSJqJu1JbOjYpzPGw1TwZczFLavFvrVE= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1225,11 +1225,11 @@ <dict> <key>hash</key> <data> - x1JyR8RqF2Srvb1EYX88l+Wz5qA= + iqX2jg1B1fMIoMZ9UDOmdeXY5R4= </data> <key>hash2</key> <data> - UwdT2MNfCcTLUmkTNAr64lWQtJdMUAUmo+EfK20VnyU= + gMqNEgIOHD+Z9Gy63ewBuCTkzHwIFKxy5ZoW5F8j34I= </data> </dict> <key>www/css/blogs.css</key> @@ -1412,11 +1412,11 @@ <dict> <key>hash</key> <data> - aCFlsZzgMtbv6Z6bkKwkakJFAdo= + 4hSh6NJLuzHKgsQdhOHFsDdrYzw= </data> <key>hash2</key> <data> - qtRpDWjlUFVBpfJ/bHYPC6ujK5kyXIQzmoEI/5hzj+Q= + tsgmNkmV0VZ32vL2LL7P+orl/qg4HkH8u2R9gxz3ZhQ= </data> </dict> <key>www/css/products.css</key> @@ -1731,11 +1731,11 @@ <dict> <key>hash</key> <data> - qsauVM0WF8MlOnPraEK8ZDT+5IE= + Cqs564HHydS1cajG/YyUxH/m/qQ= </data> <key>hash2</key> <data> - icY+bnIhaKGjdyf26EVGhSNnJghNlKKZhRns4nF6bs4= + ObsyOOX1Wpph0NY4+PW+WpCRRymwVZbyp6Pi8TuFRpY= </data> </dict> <key>www/js/index.js</key> @@ -1797,11 +1797,11 @@ <dict> <key>hash</key> <data> - NJ8cYUUHtA916ySMroE/5GaEc+M= + g81ByC4WQ4lAdrDltz7b/C/MqNY= </data> <key>hash2</key> <data> - Dk4H1qQdeSVHOaMX500ZOvEI00NddcaHzeeqqRiM5RE= + eV4PAhtf/St/MYaS5Koc1N1RUYoGLWjleg4o9+fh6cQ= </data> </dict> <key>www/js/lib/account/SettingsView.js</key> @@ -2226,11 +2226,11 @@ <dict> <key>hash</key> <data> - 1axFnf92uYJ5GPvZdeKU+zPGLuw= + TZu3vDiiaHeg3ApJ+HZowCDsPvE= </data> <key>hash2</key> <data> - IdU+9EOTCaklhVdIzqZGvDbO6IwPkIM/fYhJPYvUEHY= + 8Ctj4kMul3md0vu7ihiR3Fz8H7X1/CcMMZ0Jctd4S2Q= </data> </dict> <key>www/js/lib/view/View.js</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css index 471ea3f7..da710fd7 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css @@ -438,6 +438,7 @@ input.switch:checked + label:after { position: relative; transform: translateX(-50%); padding-top: 15px; + padding-bottom: 80px; } .select-wrapper { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css index 30f1af18..9445f5cb 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css @@ -51,7 +51,11 @@ } #nav .account_menu span, #nav .faq_menu span { - padding: 28px 0 0px 20px; + padding: 20px 0 0px 20px; +} +#nav .account_menu span.menu-emphasis, +#nav .faq_menu span.menu-emphasis { + padding-top: 28px; } #nav .faq_menu span:last-child { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html index 8f615d8b..28c4f8c6 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html @@ -315,7 +315,7 @@ <div class="container"> <div class="container-row"> <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="1"> - <input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"> + <form><input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"></form> </div> <div class="container-fill"> <div class="container-message premessage"> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ProfileView.js index 98dba019..52ef8056 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ProfileView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ProfileView.js @@ -3,6 +3,7 @@ var ProfileView = FormView.extend({ el: "#profile", events: { + "click .privacy-msg": "privacy_link", }, action: sdk.account.update, @@ -90,6 +91,17 @@ var ProfileView = FormView.extend({ return submissible_data }, + privacy_link: function(){ + // rewrite app.privacy instance temporarily + app.privacy.back = function(){ + app.router.go("account/profile") + } + app.privacy.hide = function(){ + app.privacy.back = app.privacy.hide = null + } + app.router.go("page/privacy") + }, + success: function(data){ }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js index 8d25daf4..fa4eba02 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js @@ -128,6 +128,7 @@ var SerializableView = View.extend({ } else { this.hide_errors() + cordova.plugins.Keyboard.close() } var finalized_data = this.finalize(valid.data) diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex d603a6f0..c79b0fb4 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index 471ea3f7..da710fd7 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -438,6 +438,7 @@ input.switch:checked + label:after { position: relative; transform: translateX(-50%); padding-top: 15px; + padding-bottom: 80px; } .select-wrapper { diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index 30f1af18..9445f5cb 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -51,7 +51,11 @@ } #nav .account_menu span, #nav .faq_menu span { - padding: 28px 0 0px 20px; + padding: 20px 0 0px 20px; +} +#nav .account_menu span.menu-emphasis, +#nav .faq_menu span.menu-emphasis { + padding-top: 28px; } #nav .faq_menu span:last-child { diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 8f615d8b..28c4f8c6 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -315,7 +315,7 @@ <div class="container"> <div class="container-row"> <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="1"> - <input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"> + <form><input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"></form> </div> <div class="container-fill"> <div class="container-message premessage"> diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js index 98dba019..52ef8056 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js @@ -3,6 +3,7 @@ var ProfileView = FormView.extend({ el: "#profile", events: { + "click .privacy-msg": "privacy_link", }, action: sdk.account.update, @@ -90,6 +91,17 @@ var ProfileView = FormView.extend({ return submissible_data }, + privacy_link: function(){ + // rewrite app.privacy instance temporarily + app.privacy.back = function(){ + app.router.go("account/profile") + } + app.privacy.hide = function(){ + app.privacy.back = app.privacy.hide = null + } + app.router.go("page/privacy") + }, + success: function(data){ }, diff --git a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js index 8d25daf4..fa4eba02 100755 --- a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js +++ b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js @@ -128,6 +128,7 @@ var SerializableView = View.extend({ } else { this.hide_errors() + cordova.plugins.Keyboard.close() } var finalized_data = this.finalize(valid.data) diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css index 471ea3f7..da710fd7 100755 --- a/StoneIsland/www/css/account.css +++ b/StoneIsland/www/css/account.css @@ -438,6 +438,7 @@ input.switch:checked + label:after { position: relative; transform: translateX(-50%); padding-top: 15px; + padding-bottom: 80px; } .select-wrapper { diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index 30f1af18..9445f5cb 100755 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -51,7 +51,11 @@ } #nav .account_menu span, #nav .faq_menu span { - padding: 28px 0 0px 20px; + padding: 20px 0 0px 20px; +} +#nav .account_menu span.menu-emphasis, +#nav .faq_menu span.menu-emphasis { + padding-top: 28px; } #nav .faq_menu span:last-child { diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 8f615d8b..28c4f8c6 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -315,7 +315,7 @@ <div class="container"> <div class="container-row"> <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="1"> - <input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"> + <form><input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"></form> </div> <div class="container-fill"> <div class="container-message premessage"> diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js index 98dba019..52ef8056 100755 --- a/StoneIsland/www/js/lib/account/ProfileView.js +++ b/StoneIsland/www/js/lib/account/ProfileView.js @@ -3,6 +3,7 @@ var ProfileView = FormView.extend({ el: "#profile", events: { + "click .privacy-msg": "privacy_link", }, action: sdk.account.update, @@ -90,6 +91,17 @@ var ProfileView = FormView.extend({ return submissible_data }, + privacy_link: function(){ + // rewrite app.privacy instance temporarily + app.privacy.back = function(){ + app.router.go("account/profile") + } + app.privacy.hide = function(){ + app.privacy.back = app.privacy.hide = null + } + app.router.go("page/privacy") + }, + success: function(data){ }, diff --git a/StoneIsland/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js index 8d25daf4..fa4eba02 100755 --- a/StoneIsland/www/js/lib/view/Serializable.js +++ b/StoneIsland/www/js/lib/view/Serializable.js @@ -128,6 +128,7 @@ var SerializableView = View.extend({ } else { this.hide_errors() + cordova.plugins.Keyboard.close() } var finalized_data = this.finalize(valid.data) |