From 1420584ae4c41d4f89743c512b00befe814b54bb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 5 Nov 2019 17:03:50 +0100 Subject: rebuild ios --- .../xcschemes/xcschememanagement.plist | 2 +- .../xcschemes/xcschememanagement.plist | 2 +- .../xcshareddata/WorkspaceSettings.xcsettings | 2 + .../UserInterfaceState.xcuserstate | Bin 37029 -> 38956 bytes .../ios/Stone Island/Stone Island-Info.plist | 8 ++- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- StoneIsland/platforms/ios/Stone Island/main.m | 2 +- .../ios/cordova/lib/list-emulator-build-targets | 18 +++-- StoneIsland/platforms/ios/www/css/account.css | 8 ++- StoneIsland/platforms/ios/www/css/blogs.css | 36 +++++++--- StoneIsland/platforms/ios/www/css/index.css | 13 ++++ StoneIsland/platforms/ios/www/css/nav.css | 80 ++++++++++++++++++--- .../platforms/ios/www/css/vendor/imageviewer.css | 4 +- StoneIsland/platforms/ios/www/index.html | 24 +++++-- .../platforms/ios/www/js/lib/auth/LoginView.js | 2 +- .../platforms/ios/www/js/lib/auth/SignupView.js | 24 +++---- .../platforms/ios/www/js/lib/blogs/StoryView.js | 2 +- .../platforms/ios/www/js/lib/etc/accessibility.js | 4 +- .../platforms/ios/www/js/lib/nav/CurtainView.js | 2 +- .../platforms/ios/www/js/lib/nav/NavView.js | 8 ++- .../platforms/ios/www/js/lib/view/Serializable.js | 9 +++ .../platforms/ios/www/js/vendor/imageviewer.js | 11 +-- 22 files changed, 202 insertions(+), 61 deletions(-) diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 3038bdb4..1020c69e 100644 --- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ Cordova.xcscheme_^#shared#^_ orderHint - 4 + 3 CordovaLib.xcscheme diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 605e51b3..4dadab85 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ Stone Island.xcscheme_^#shared#^_ orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 949b6789..6b30c745 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -4,5 +4,7 @@ BuildSystemType Original + PreviewsEnabled + 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 index d4c3c9bd..0e1af5c3 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index aa7b8366..04d767f3 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.4 + 1.2.6 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 1.2.4 + 1.2.6 GCM_SENDER_ID 85075801930 IS_GCM_ENABLED @@ -74,5 +74,9 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown + NSLocationAlwaysAndWhenInUseUsageDescription + Stone Island needs to serve content based on your location. + NSLocationAlwaysUsageDescription + Stone Island needs to serve content based on your location. \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 4368e5b6..0be22073 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/Stone Island/main.m b/StoneIsland/platforms/ios/Stone Island/main.m index 861ee04c..7b59c4de 100644 --- a/StoneIsland/platforms/ios/Stone Island/main.m +++ b/StoneIsland/platforms/ios/Stone Island/main.m @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) { @autoreleasepool { - int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate"); + int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate"); return retVal; } } diff --git a/StoneIsland/platforms/ios/cordova/lib/list-emulator-build-targets b/StoneIsland/platforms/ios/cordova/lib/list-emulator-build-targets index c0d566fb..ccf61f98 100755 --- a/StoneIsland/platforms/ios/cordova/lib/list-emulator-build-targets +++ b/StoneIsland/platforms/ios/cordova/lib/list-emulator-build-targets @@ -50,13 +50,23 @@ function listEmulatorBuildTargets () { var availableDevices = Object.keys(devices).reduce(function (availAcc, deviceCategory) { var availableDevicesInCategory = devices[deviceCategory]; availableDevicesInCategory.forEach(function (device) { - if (device.name === deviceType.name.replace(/\-inch/g, ' inch') && - device.availability.toLowerCase().indexOf('unavailable') < 0) { - availAcc.push(device); - } + if (device && device.name === deviceType.name.replace(/\-inch/g, ' inch') && device.isAvailable == true) { + availAcc.push(device); + } }); return availAcc; }, []); + + // var availableDevices = Object.keys(devices).reduce(function (availAcc, deviceCategory) { + // var availableDevicesInCategory = devices[deviceCategory]; + // availableDevicesInCategory.forEach(function (device) { + // if (device.name === deviceType.name.replace(/\-inch/g, ' inch') && + // device.availability.toLowerCase().indexOf('unavailable') < 0) { + // availAcc.push(device); + // } + // }); + // return availAcc; + //}, []); // we only want device types that have at least one available device // (regardless of OS); this filters things out like iPhone 4s, which // is present in deviceTypes, but probably not available on the user's diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index 12adb2d9..998b6eac 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -557,16 +557,20 @@ input.switch:checked + label:after { } .container-row .half-input input { -margin-top:0px + margin-top:0px; } .newuser { display:inline-block; padding:18px; text-decoration:underline + border: 1px solid black; + margin: 0 8px 0 0; } .forgotpassword { padding:18px; text-decoration:underline -} \ No newline at end of file + border: 1px solid black; + margin: 0 0 0 8px; +} diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css index c4b74c19..ee54a31f 100755 --- a/StoneIsland/platforms/ios/www/css/blogs.css +++ b/StoneIsland/platforms/ios/www/css/blogs.css @@ -6,20 +6,23 @@ margin: 15px 0 0; text-align: center; text-transform:uppercase; - display:flex; + display: flex; flex-direction: row; justify-content: center; align-items: center; flex-wrap: wrap; } #story .links li { + display: block; + list-style-type: none; + font-size: 1rem; +} +#story .links li div { display: flex; justify-content: center; align-items: center; height: 48px; padding: 0 15px; - list-style-type: none; - font-size: 1rem; } .accessible #story .links { flex-wrap: wrap; @@ -166,6 +169,10 @@ position:absolute; display:block; } +.accessible .gallery-left, +.accessible .gallery-right { + width: 48px; +} @-webkit-keyframes gallery-fade { 0%{opacity:0} @@ -259,14 +266,25 @@ ul.links { width: 100%; pointer-events: none; } -#archive .menu .items, -#archive .row .image, -#archive .row .text { +#archive .menu .items { position: absolute; top: 50%; left: 50%; transform-origin: 50% 50%; transform: translateZ(0) translateX(-50%) translateY(-50%); } +#archive .row .image { + position: absolute; + top: 10%; left: 50%; + transform-origin: 50% 50%; + transform: translateZ(0) translateX(-50%) translateY(0%); +} +#archive .row .text { + display: flex; + justify-content: center; + align-items: center; + min-height: 80vh; + padding: 16px 0; +} #archive .menu { position: fixed; display: none; @@ -278,7 +296,8 @@ ul.links { .accessible #archive .row .image, .accessible #archive .row .text { position: relative; - top: auto; left: auto; + top: auto; + left: auto; transform: translateZ(0); } @@ -338,6 +357,7 @@ ul.links { } #archive .row .image { width: 100%; height: 100%; + max-height: 80vh; background-repeat: no-repeat; background-size: contain; background-position: center center; @@ -348,7 +368,7 @@ ul.links { background-position: center center; background-image: url('../img/spinner.gif') !important; } -#archive .row .text { +#archive .row .text > div { width: 80%; } .accessible #archive .row .image { diff --git a/StoneIsland/platforms/ios/www/css/index.css b/StoneIsland/platforms/ios/www/css/index.css index 83b3353a..2130c675 100755 --- a/StoneIsland/platforms/ios/www/css/index.css +++ b/StoneIsland/platforms/ios/www/css/index.css @@ -102,6 +102,19 @@ html.vscroll { .error_hilite ~ span.err { display: flex; } +.err_heading { + display: none; +} +.err_heading.error_visible { + display: flex; + text-align: center; + justify-content: center; + align-items: center; + font-size: 0.875rem; + height: 64px; + padding: 12px; + color: red !important; +} span.err { display: none; text-align: center; diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index f555ce99..705c0824 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -2,7 +2,7 @@ /* NAV BAR */ #nav { - position: absolute; + position: fixed; top: 0; left: 0; width: 249px; -webkit-transform: translateZ(0) translateX(-249px); @@ -10,7 +10,7 @@ background: #fff; } #content { - position: absolute; + position: fixed; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; @@ -23,6 +23,10 @@ .nav #content { -webkit-transform: translateZ(0) translateX(249px); } +.accessible #nav, +.accessible #content { + position: absolute; +} #nav .logo { background-image: url(../img/small-logo.png); background-repeat: no-repeat; @@ -85,19 +89,62 @@ #nav .social { position: absolute; - bottom: 0; + top: calc(100vh - 48px); left: 0; border-top: 1px solid #ddd; + display: flex; + flex-direction: row; } #nav .social span { display: block; - float: left; width: 61px; border-left: 1px solid #ddd; color: #666; font-size: 1.125rem; - padding: 5px 0; + height: 48px; text-align: center; + justify-content: center; + align-items: center; + display: flex; +} + +#nav .close { + position: absolute; + top: 0; + right: 0; + width: 48px; + height: 48px; + cursor: pointer; + text-align: center; + overflow: hidden; + -webkit-transition: all ease 200ms; + -moz-transition: all ease 200ms; + -o-transition: all ease 200ms; + transition: all ease 200ms; +} +#nav .close:after, +#nav .close:before { + content: ""; + height: 1px; + width: 24px; + background: #888; + position: absolute; + left: 25%; + top: 50%; +} +#nav .close:before { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +#nav .close:after { + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + -o-transform: rotate(-45deg); + transform: rotate(-45deg); } #nav-container { @@ -198,7 +245,8 @@ padding-bottom:0px; /* HEADER AND FOOTER ON MOST PAGES */ #header { - display: block; + display: flex; + justify-content: space-between; position: absolute; top: 0; left: 0; width: 100%; height: 48px; @@ -216,9 +264,15 @@ padding-bottom:0px; top:0px; } #header .burger { - display: inline-block; + display: flex; font-size: 24px; - padding: 12px 13px 7px; + width: 48px; + height: 48px; + padding-top: 4px; + box-sizing: border-box; + align-items: center; + flex-direction: row; + justify-content: center; } #header .cart_rapper { @@ -268,7 +322,7 @@ padding-bottom:0px; #footer { display: block; - position: absolute; + position: fixed; bottom: 0; left: 0; width: 100%; background: #fff; border-top: 1px solid #ddd; @@ -296,13 +350,16 @@ padding-bottom:0px; #footer .ok.disabled { color: #666; } +.accessible #footer { + position: absolute; +} /* CURTAIN FOR LOGIN AND SELECTOR VIEWS */ #curtain { pointer-events: none; - position: absolute; + position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255,255,255,0.8); @@ -312,6 +369,9 @@ padding-bottom:0px; -webkit-transform: translateZ(0) translateX(0); transform: translateZ(0) translateX(0); } +.accessible #curtain { + position: absolute; +} #curtain.visible { pointer-events: auto; opacity: 1; diff --git a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css index af346f08..739c37a1 100644 --- a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css +++ b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css @@ -22,8 +22,8 @@ } .iv-close { - width: 32px; - height: 32px; + width: 48px; + height: 48px; position: fixed; right: 20px; top: 20px; diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index a422832c..568161e5 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -16,6 +16,7 @@ + @@ -37,6 +38,7 @@ +