Merge branch 'master' of github.com:okfocus/stone-island

2 files changed, 27 insertions, 3 deletions

diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index 1d3506e5..24b00cf0 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -201,7 +201,7 @@ input.switch:checked + label:after {
 
 .container {
   position:absolute; 
-  height:calc(100% - 104px);
+  height:calc(100vh - 154px);
   width:100vw;
   box-sizing:border-box;
   display: flex;  
diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css
index a4c1f67b..9b4e4fd3 100644
--- a/StoneIsland/www/css/nav.css
+++ b/StoneIsland/www/css/nav.css
@@ -139,7 +139,6 @@
   position: absolute;
   top: 0; left: 0; width: 100%;
   height: 42px;
-  background: white;
   border-bottom: 1px solid black;
 }
 #header .logo {
@@ -157,12 +156,37 @@
   font-size: 24px;
   padding: 6px 10px;
 }
+
 #header .cart {
   display: inline-block;
-  padding: 6px 10px;
   float: right;
+  width: 18px;
+  top:14px;
+  height: 18px;
+  margin-right:18px;
+  border: 1px solid #a9a9a9;
+  position: relative;
+  background: #fff;
 }
 
+.cart .cart_count {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translateY(-50%) translateX(-50%);
+  color: #a9a9a9;
+  font-size:13px
+}
+
+.cart::before {
+  position: absolute;
+  content: '\25E0';
+  left:50%;
+  transform:translateX(-50%);
+  color:#a9a9a9;
+  font-size:20px;
+  top:calc(-100%);
+}
 
 #footer {
   display: block;