diff options
| -rwxr-xr-x | StoneIsland/platforms/android/AndroidManifest.xml | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/css/account.css | 18 | ||||
| -rwxr-xr-x | StoneIsland/www/css/cart.css | 4 | ||||
| -rwxr-xr-x | StoneIsland/www/css/nav.css | 6 | ||||
| -rwxr-xr-x | StoneIsland/www/index.html | 30 | ||||
| -rwxr-xr-x | StoneIsland/www/js/index.js | 2 |
6 files changed, 37 insertions, 25 deletions
diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 0feefa18..138f0f30 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true"> - <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize"> + <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustPan"> <intent-filter android:label="@string/launcher_name"> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css index d96073e4..4c71ac57 100755 --- a/StoneIsland/www/css/account.css +++ b/StoneIsland/www/css/account.css @@ -295,13 +295,17 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; @@ -309,9 +313,11 @@ input.switch:checked + label:after { box-sizing:border-box; margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -350,12 +356,12 @@ input.switch:checked + label:after { .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -509,11 +515,11 @@ margin-bottom:9px!important .newuser { display:inline-block; - padding:20px; + padding:14px; text-decoration:underline } .forgotpassword { - padding:20px; + padding:14px; text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css index 9fbc54b3..c214c93e 100755 --- a/StoneIsland/www/css/cart.css +++ b/StoneIsland/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index 832ec46a..05e4aedc 100755 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -395,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 4058403c..9f8da2b4 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -418,20 +418,26 @@ <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-profile"></label> + <div class="container-fill container-fill-condensed"> + <div class="container-message container-message-condensed"> + <span class="msg msg-condensed"> + </span> </div> </div> <div class="container-row"> <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> + </div> + <label class="checkbox-caption" for="receive-newsletter-profile"> + <b>Newsletter</b><br> + Receive Stone Island Newsletter + </label> + </div> + <div class="checkbox-row"> + <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> @@ -445,14 +451,6 @@ </div> </div> </div> - <div class="container-fill"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> </div> </form> </div> diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 050a729c..ad4c6d20 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -3,7 +3,7 @@ var app = (function(){ app.init = function(){ - sdk.init({ env: "production" }) + sdk.init({ env: "development" }) app.bind() app.build() |