android tidy

10 files changed, 27 insertions, 16 deletions

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index c45658a0..c83d9dc7 100644
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -99,7 +99,7 @@
 
 .content-share {
   border:1px solid black;
-  padding:4px 8px;
+  padding:4px 8px 2px;
   float:right
 }
 
diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css
index a75fb35c..d785c458 100644
--- a/StoneIsland/www/css/nav.css
+++ b/StoneIsland/www/css/nav.css
@@ -29,7 +29,7 @@
   -webkit-transform: translateZ(0) translateX(249px);
 }
 #nav .logo {
-  background-image: url(../img/wide-logo.png);
+  background-image: url(../img/small-logo.png);
   background-repeat: no-repeat;
   background-position: center center;
   background-size: contain;
@@ -103,7 +103,7 @@
 
 #nav-container {
   display:flex;
-  height:calc(100% - 40px);
+  height:calc(100vh - 40px);
   width:100%;
   position:absolute;
   flex-direction: column;
@@ -185,19 +185,20 @@ padding-bottom:0px;
   border-bottom: 1px solid black;
 }
 #header .logo {
-  background-image: url(../img/wide-logo.png);
+  background-image: url(../img/small-logo.png);
   background-repeat: no-repeat;
   background-position: center center;
   position: absolute;
   background-size: contain;
-  width: 120px; height: 40px;
+  width: 100px; height: 40px;
   left: 50%; top: -4px;
-  margin-left: -60px;
+  margin-left: -50px;
+  top:0px;
 }
 #header .burger {
   display: inline-block;
   font-size: 24px;
-  padding: 6px 10px;
+  padding: 9px 10px 5px;
 }
 
 #header .cart {
@@ -207,9 +208,12 @@ padding-bottom:0px;
   top: 15px;
   height: 18px;
   margin-right:18px;
-  border: 1px solid #a9a9a9;
+    background: #fff;
+  background-image:url(../img/cart-box.png);
+  background-size:100%;
+  background-repeat:no-repeat;
   position: relative;
-  background: #fff;
+
 }
 
 .cart .cart_count {
@@ -217,18 +221,25 @@ padding-bottom:0px;
   top: 50%;
   left: 50%;
   transform: translateY(-50%) translateX(-50%);
-  color: #a9a9a9;
+  color: #bbb;
   font-size:13px
 }
 
 .cart::before {
   position: absolute;
-  content: '\25E0';
-  left:50%;
-  transform:translateX(-50%);
-  color:#a9a9a9;
-  font-size:20px;
-  top:calc(-100%);
+  content: '';
+  left: 50%;
+  transform: translateX(-50%);
+  color: #a9a9a9;
+  background-image: url(../img/small-cart-handle.png);
+  font-size: 20px;
+  background-size: 16px 8px;
+  background-repeat: no-repeat;
+  background-position: center;
+  width: 16px;
+  height: 8px;
+  top: calc(-50%);
+  opacity: 0.3;
 }
 
 #footer {
diff --git a/StoneIsland/www/img/bottom-fade.png b/StoneIsland/www/img/bottom-fade.png
new file mode 100755
index 00000000..2765c9bf
--- /dev/null
+++ b/StoneIsland/www/img/bottom-fade.png
diff --git a/StoneIsland/www/img/cart-box.png b/StoneIsland/www/img/cart-box.png
new file mode 100755
index 00000000..4f2ff471
--- /dev/null
+++ b/StoneIsland/www/img/cart-box.png
diff --git a/StoneIsland/www/img/cart-handle.png b/StoneIsland/www/img/cart-handle.png
new file mode 100755
index 00000000..96b9e400
--- /dev/null
+++ b/StoneIsland/www/img/cart-handle.png
diff --git a/StoneIsland/www/img/fade-to-bottom-threshold.gif b/StoneIsland/www/img/fade-to-bottom-threshold.gif
new file mode 100755
index 00000000..808757e9
--- /dev/null
+++ b/StoneIsland/www/img/fade-to-bottom-threshold.gif
diff --git a/StoneIsland/www/img/fade-to-bottom.png b/StoneIsland/www/img/fade-to-bottom.png
new file mode 100755
index 00000000..2765c9bf
--- /dev/null
+++ b/StoneIsland/www/img/fade-to-bottom.png
diff --git a/StoneIsland/www/img/small-cart-box.png b/StoneIsland/www/img/small-cart-box.png
new file mode 100755
index 00000000..59ebcd70
--- /dev/null
+++ b/StoneIsland/www/img/small-cart-box.png
diff --git a/StoneIsland/www/img/small-cart-handle.png b/StoneIsland/www/img/small-cart-handle.png
new file mode 100755
index 00000000..6b3567c2
--- /dev/null
+++ b/StoneIsland/www/img/small-cart-handle.png
diff --git a/StoneIsland/www/img/small-logo.png b/StoneIsland/www/img/small-logo.png
new file mode 100755
index 00000000..7b6e1b0d
--- /dev/null
+++ b/StoneIsland/www/img/small-logo.png