summaryrefslogtreecommitdiff
path: root/StoneIsland/www
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www')
-rwxr-xr-xStoneIsland/www/css/nav.css4
-rwxr-xr-xStoneIsland/www/css/products.css4
-rwxr-xr-xStoneIsland/www/index.html2
-rwxr-xr-xStoneIsland/www/js/lib/blogs/BlogView.js2
-rwxr-xr-xStoneIsland/www/js/lib/products/CollectionView.js2
-rwxr-xr-xStoneIsland/www/js/lib/products/ProductView.js6
6 files changed, 13 insertions, 7 deletions
diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css
index c84b5b30..30f1af18 100755
--- a/StoneIsland/www/css/nav.css
+++ b/StoneIsland/www/css/nav.css
@@ -412,6 +412,10 @@ padding-bottom:0px;
width: 100%;
overflow: hidden;
}
+#collection.single {
+ height: -webkit-calc(100% - 43px);
+ height: calc(100% - 43px);
+}
#story, #hub, #archive, .page, #closed {
/* these things do not have a footer */
height: -webkit-calc(100% - 43px);
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index 96a6afd4..e067e05a 100755
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/www/css/products.css
@@ -16,10 +16,10 @@
background: rgba(245,245,245,1.0);
}
-#collection .single .item {
+#collection.single .item {
max-width: 98vw;
}
-#collection .single .item img {
+#collection.single .item img {
width: 98vw;
height: 126vw;
}
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 0d6cd6c6..768e3140 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -12,7 +12,7 @@
-->
-<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; object-src * 'unsafe-inline' 'unsafe-eval'; style-src * 'unsafe-inline' 'unsafe-eval'; img-src * 'unsafe-inline' 'unsafe-eval'; media-src * 'unsafe-inline' 'unsafe-eval'; frame-src * 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline' 'unsafe-eval'">
+<meta http-equiv="Content-Security-Policy" content="default-src * gap: 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; object-src * 'unsafe-inline' 'unsafe-eval'; style-src * 'unsafe-inline' 'unsafe-eval'; img-src * 'unsafe-inline' 'unsafe-eval'; media-src * 'unsafe-inline' 'unsafe-eval'; frame-src * gap: 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline' 'unsafe-eval'">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 4192b693..b7c80520 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -10,7 +10,7 @@ var BlogView = View.extend({
$.ajax({
method: "GET",
// url: sdk.env == 'test' ? '/db.json' : "https://stone.sup.land/db.json",
- url: "http://stone.sup.land/db.json",
+ url: "https://stone.sup.land/db.json",
success: function(data){
this.success(data)
fn && fn()
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 8be650c5..b9a7755f 100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -92,7 +92,7 @@ var CollectionView = ScrollableView.extend({
// DefaultCode10
// data.SearchResponseFull.Results.Items.length = 1
var is_single_product = (data.SearchResponseFull.Results.Items.length < 4)
- this.$content.toggleClass("single", is_single_product)
+ this.$el.toggleClass("single", is_single_product)
if (is_single_product) {
console.log("IS SINGLE PRODUCT")
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index 683d079d..cfb39f20 100755
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -113,8 +113,6 @@ var ProductView = ScrollableView.extend({
var descriptions = this.get_descriptions(details)
- this.gallery.populate( data['Code8'], details['Item']['ImageTypes'] )
-
var name_partz = data['ModelNames'].split(' ')
var num = name_partz.shift()
var title = name_partz.join(' ')
@@ -129,15 +127,19 @@ var ProductView = ScrollableView.extend({
this.$style.css("opacity", 0)
this.$color.html("NOT AVAILABLE")
this.$size.hide()
+ this.gallery.populate( data['Code8'], details['Item']['ImageTypes'] )
}
else {
this.$style.css("opacity", 1)
+
var color = this.colors[default_color_id]
var color_label = color.label
var sizes = this.find_sizes_for_color(default_color_id)
var size = sizes[0]
var size_label = this.sizes[size].label
+ this.gallery.populate( color.code, details['Item']['ImageTypes'] )
+
this.color = color
this.size = size