Merge branch 'develop' into tvw

app/assets/stylesheets/application.css

@@ -1885,7 +1885,6 @@ and it won't be important on password protected instances */
     width:32px;
     height:32px;
     margin:10px auto;
-    background-position: 0 0;
 }
 #lightbox_metamapps .lightboxAboutIcon {
     background-position: 0 0;

app/assets/stylesheets/clean.css

@@ -798,26 +798,32 @@
     background-position: 0 0;
 	cursor:pointer;
 }
-.mapControl:hover {
-    background-position: -32px 0;
-}
 .zoomExtents {
     margin-bottom:5px;
     border-radius: 2px;
     background-image: url(extents_sprite.png);
 }
+.zoomExtents:hover {
+    background-position: -32px 0;
+}
 .zoomIn {
     background-image: url(zoom_sprite.png);
     background-position: 0 0;
     border-top-left-radius: 2px;
     border-top-right-radius: 2px;
 }
+.zoomIn:hover {
+    background-position: -32px 0;
+}
 .zoomOut {
     background-image: url(zoom_sprite.png);
     background-position:0 -32px;
     border-bottom-left-radius: 2px;
     border-bottom-right-radius: 2px;
 }
+.zoomOut:hover {
+    background-position: -32px -32px;
+}
 
 /* end mapControls */
 
@@ -840,7 +846,7 @@
 }
 
 .exploreMapsCenter {
-    z-index: 3;
+    z-index: 3 !important;
 }
 
 .exploreMapsButton {
@@ -882,8 +888,14 @@
     background-image: url(exploremaps_sprite.png);
     background-position: -64px 0;
 }
-.exploreMapsButton:hover .exploreMapsIcon, .exploreMapsButton.active .exploreMapsIcon {
-    background-position: -32px 0;
+.myMaps:hover .exploreMapsIcon, .myMaps.active .exploreMapsIcon {
+    background-position: 0 -32px;
+}
+.activeMaps:hover .exploreMapsIcon, .activeMaps.active .exploreMapsIcon {
+    background-position: -32px -32px;
+}
+.featuredMaps:hover .exploreMapsIcon, .featuredMaps.active .exploreMapsIcon {
+    background-position: -64px -32px;
 }
 
 .mapsWrapper {

app/views/layouts/_lightboxes.html.erb

@@ -38,7 +38,7 @@
         
         <ul class="lightbox_links">
           <li>
-            <a id="lightbox_metamapss" href="https://twitter.com/metamapps" target="_blank">
+            <a id="lightbox_metamapps" href="https://twitter.com/metamapps" target="_blank">
               <div class="lightboxAboutIcon"></div>
               @metamapps
             </a>