summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xStoneIsland/config.xml2
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin41616 -> 41602 bytes
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist4
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island/config.xml2
-rwxr-xr-xStoneIsland/platforms/ios/www/css/nav.css16
-rwxr-xr-xStoneIsland/platforms/ios/www/index.html2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js3
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/nav/HeaderView.js2
-rwxr-xr-xStoneIsland/www/css/nav.css16
-rwxr-xr-xStoneIsland/www/index.html2
-rwxr-xr-xStoneIsland/www/js/index.js2
-rwxr-xr-xStoneIsland/www/js/lib/cart/CartSummary.js3
-rwxr-xr-xStoneIsland/www/js/lib/nav/HeaderView.js2
14 files changed, 38 insertions, 20 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index e556723e..33cbbd87 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.5.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Stone Island</name>
<description>
Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index d09e577e..95a3a47b 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 2d380863..73cfd97a 100755
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -57,7 +57,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.5.3</string>
+ <string>0.5.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>0.5.3</string>
+ <string>0.5.4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>youtube</string>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index 25a76387..caaf6ba2 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.5.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<preference name="AllowInlineMediaPlayback" value="false" />
<preference name="BackupWebStorage" value="cloud" />
<preference name="DisallowOverscroll" value="false" />
diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css
index 0b9ad123..c84b5b30 100755
--- a/StoneIsland/platforms/ios/www/css/nav.css
+++ b/StoneIsland/platforms/ios/www/css/nav.css
@@ -219,19 +219,23 @@ padding-bottom:0px;
padding: 9px 10px 5px;
}
-#header .cart {
+#header .cart_rapper {
display: inline-block;
+ position: relative;
+ float: right;
+ width: 40px; height: 40px;
+}
+#header .cart {
+ position: relative;
float: right;
width: 18px;
top: 15px;
height: 18px;
- margin-right:18px;
- background: #fff;
+ margin-right: 18px;
+ background: #fff;
background-image:url(../img/cart-box.png);
background-size:100%;
background-repeat:no-repeat;
- position: relative;
-
}
.cart .cart_count {
@@ -243,7 +247,7 @@ padding-bottom:0px;
font-size:12.35px;
}
-.cart::before {
+#header .cart::before {
position: absolute;
content: '';
left: 50%;
diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html
index a7f12b98..0d6cd6c6 100755
--- a/StoneIsland/platforms/ios/www/index.html
+++ b/StoneIsland/platforms/ios/www/index.html
@@ -109,7 +109,7 @@
<div id="header">
<span class="burger ion-android-menu"></span>
<span class="logo"></span>
- <span class="cart"><span class="cart_count">0</span></span>
+ <span class="cart_rapper"><span class="cart"><span class="cart_count">0</span></span></span>
</div>
<div id="footer">
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index cf0116d4..63059c26 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -72,6 +72,8 @@ var app = (function(){
document.addEventListener('offline', app.offline, false)
cordova.plugins.Keyboard.disableScroll(true)
geo.fetch()
+ var image = new Image
+ image.src = "/img/compass-logo.png"
}
app.view = null
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
index 01887d95..c3156265 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
@@ -170,6 +170,9 @@ var CartSummary = ScrollableView.extend({
remove_item: function(e){
var $el = $( e.currentTarget ).closest(".cart_item_row")
var data = $el.data()
+
+ console.log("REMOVE FROM CART")
+ console.log(data.size + " " + data.code)
console.log(this.data.Cart)
diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/HeaderView.js b/StoneIsland/platforms/ios/www/js/lib/nav/HeaderView.js
index 73fe106d..91089d27 100755
--- a/StoneIsland/platforms/ios/www/js/lib/nav/HeaderView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/nav/HeaderView.js
@@ -5,7 +5,7 @@ var HeaderView = View.extend({
events: {
"click .burger": "nav",
"click .logo": "logo",
- "click .cart": "cart",
+ "click .cart_rapper": "cart",
},
initialize: function(){
diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css
index 0b9ad123..c84b5b30 100755
--- a/StoneIsland/www/css/nav.css
+++ b/StoneIsland/www/css/nav.css
@@ -219,19 +219,23 @@ padding-bottom:0px;
padding: 9px 10px 5px;
}
-#header .cart {
+#header .cart_rapper {
display: inline-block;
+ position: relative;
+ float: right;
+ width: 40px; height: 40px;
+}
+#header .cart {
+ position: relative;
float: right;
width: 18px;
top: 15px;
height: 18px;
- margin-right:18px;
- background: #fff;
+ margin-right: 18px;
+ background: #fff;
background-image:url(../img/cart-box.png);
background-size:100%;
background-repeat:no-repeat;
- position: relative;
-
}
.cart .cart_count {
@@ -243,7 +247,7 @@ padding-bottom:0px;
font-size:12.35px;
}
-.cart::before {
+#header .cart::before {
position: absolute;
content: '';
left: 50%;
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index a7f12b98..0d6cd6c6 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -109,7 +109,7 @@
<div id="header">
<span class="burger ion-android-menu"></span>
<span class="logo"></span>
- <span class="cart"><span class="cart_count">0</span></span>
+ <span class="cart_rapper"><span class="cart"><span class="cart_count">0</span></span></span>
</div>
<div id="footer">
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index cf0116d4..63059c26 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -72,6 +72,8 @@ var app = (function(){
document.addEventListener('offline', app.offline, false)
cordova.plugins.Keyboard.disableScroll(true)
geo.fetch()
+ var image = new Image
+ image.src = "/img/compass-logo.png"
}
app.view = null
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index 01887d95..c3156265 100755
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -170,6 +170,9 @@ var CartSummary = ScrollableView.extend({
remove_item: function(e){
var $el = $( e.currentTarget ).closest(".cart_item_row")
var data = $el.data()
+
+ console.log("REMOVE FROM CART")
+ console.log(data.size + " " + data.code)
console.log(this.data.Cart)
diff --git a/StoneIsland/www/js/lib/nav/HeaderView.js b/StoneIsland/www/js/lib/nav/HeaderView.js
index 73fe106d..91089d27 100755
--- a/StoneIsland/www/js/lib/nav/HeaderView.js
+++ b/StoneIsland/www/js/lib/nav/HeaderView.js
@@ -5,7 +5,7 @@ var HeaderView = View.extend({
events: {
"click .burger": "nav",
"click .logo": "logo",
- "click .cart": "cart",
+ "click .cart_rapper": "cart",
},
initialize: function(){
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-19 02:28:23 +0000