summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-11-30 21:20:24 -0500
committerJules Laplace <jules@okfoc.us>2015-11-30 21:20:24 -0500
commit18925a6b8028f872323c03599b2cb1bf3e39f55d (patch)
treecb10c32ef46b517d8c88424360665282b5a5403c
parent6f8efbee0a9aac63e2644f4b0c435740fcce572b (diff)
parent3b45136a25d175cb9fb4881f671c281f70aed284 (diff)
Merge branch 'master' of github.com:okfocus/stone-island
-rw-r--r--StoneIsland/www/css/account.css6
-rw-r--r--StoneIsland/www/css/cart.css36
-rw-r--r--StoneIsland/www/css/products.css8
-rw-r--r--StoneIsland/www/index.html2
4 files changed, 46 insertions, 6 deletions
diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index 7d6247c2..3c04e1b1 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -408,7 +408,11 @@ input.switch:checked + label:after {
}
.container-row input:first-child {
-margin-top:10px!important
+margin-top:10px
+}
+
+.container-row .half-input input {
+margin-top:0px
}
#login .container-row input:first-child {
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index ad844701..52b2a4cb 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -128,6 +128,42 @@ padding-bottom:5px;
padding-left:5px;
}
+.cart_item_price .remove {
+display:block;
+width:20px;
+height:20px;
+border:1px solid #d2d2d2;
+float:right;
+margin-bottom:10px;
+position:relative;
+}
+
+.cart_item_price .remove:after {
+content:'';
+width:1px;
+height:22px;
+background:#bbb;
+position:absolute;
+top:50%;
+left:50%;
+z-index:3;
+transform-origin:top left;
+transform:rotate(45deg) translateX(-50%) translateY(-50%)
+}
+
+.cart_item_price .remove:before {
+content:'';
+width:1px;
+height:22px;
+background:#bbb;
+position:absolute;
+top:50%;
+left:50%;
+z-index:3;
+transform-origin:top left;
+transform:rotate(-45deg) translateX(-50%) translateY(-50%)
+}
+
.cart_item_price .price {
font-size:11px;
font-weight:bold;
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index 4633aa0c..78d02811 100644
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/www/css/products.css
@@ -63,11 +63,7 @@
}
#closed .closed_store_msg {
position: absolute;
- top:50%;
- transform:translateY(-50%);
- /*
bottom: 20vh;
- */
background: rgba(255,255,255,0.9);
padding-top: 20px;
padding-bottom: 10px;
@@ -235,3 +231,7 @@
clear:both;
padding:13px 0;
}
+
+#collection h1 {
+background:white
+}
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index a213694d..977b77cb 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -609,7 +609,7 @@
</div>
</div>
<div class="cart_item_price">
- <span class="remove">x Remove from cart</span>
+ <span class="remove"></span>
<span class="price">{{price}}</span>
</div>
</script>