Merge branch 'android' of https://github.com/okfocus/stone-island into android

1 files changed, 33 insertions, 7 deletions

diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css
index c769dabd..832ec46a 100755
--- a/StoneIsland/platforms/ios/www/css/nav.css
+++ b/StoneIsland/platforms/ios/www/css/nav.css
@@ -81,7 +81,7 @@
   font-size: 14px;
   letter-spacing:1.25px;
   color: #bbb;
-  padding: 4px 0 7px 20px
+  padding: 4px 0 12px 20px
 }
 
 #nav .social {
@@ -321,20 +321,46 @@ padding-bottom:0px;
 #selector {
   display: none;
   position: absolute;
-  bottom: 0; left: 0;
   background: #fff;
   z-index: 2;
-  width:100%;
-  box-sizing:border-box
+  box-sizing:border-box;
+  min-width:100px;
+  animation: selector-spring .15s forwards;
+  animation-timing-function: cubic-bezier(.43,1,.89,.95)
 }
+
+@keyframes selector-spring { 
+  0% { 
+  margin-top: 15px
+  } 
+  100% { 
+  margin-top: 0
+  } 
+} 
+
 #selector .options div {
-  width: 100%;
   background: white;
   text-align: center;
-  padding: 8px;
-
+  padding: 7px 12px;
   box-sizing:border-box;
   font-size: 14px;
+  border-left:1px solid black;
+  border-right:1px solid black;
+  border-top:1px solid black;
+
+}
+
+#selector .options div:last-of-type {
+  border-bottom:1px solid black
+}
+
+.selector-full {
+    width: 100% !important;
+    box-sizing:border-box
+}
+
+.selector-full > div > div {
+    padding: 12px 0 !important;
 }
 
 /* CONTENT */