Use the small zoom control in the small screen layout

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 8abda38105507280fddf451fa6c4d47bf1674537..d3d644801074a568028c6bb8177405d2fb95f854 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -48,7 +48,8 @@ h2 {
 
 #left {
   position: absolute;
-  top: 0px;
+  top: 30px;
+  bottom: 0;
   width: 185px;
   font-size: 11px;
   line-height: 12px;
@@ -62,7 +63,7 @@ h2 {
   min-width: 170px;
   padding: 5px;
   text-align: center;
-  margin: 25px auto 5px auto;
+  margin: auto;
 }
 
 #logo img {
@@ -255,7 +256,7 @@ h2 {
   text-transform: capitalize;
   padding-left: 0px;
   padding-right: 0px;
-  background: url(sprite.png);
+  background: image-url("sprite.png");
   position: absolute;
   top: 5px;
   cursor: pointer;
@@ -307,7 +308,7 @@ h2 {
   border: 0px;
   padding-left: 0px;
   padding-right: 0px;
-  background: url(sprite.png) 0 -30px no-repeat;
+  background: image-url("sprite.png") 0 -30px no-repeat;
   position: absolute;
   top: 8px;
 }
@@ -322,8 +323,11 @@ h2 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
-  border-bottom: 1px solid #ccc;
+  position: absolute;
+  top: 0;
   height: 29px;
+  border-bottom: 1px solid #ccc;
+  background: white;
 }
 
 #tabnav {
@@ -411,7 +415,7 @@ body.site-export #tabnav a#exportanchor {
   top: 15px;
 }
 
-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */
 
 #map {
   margin: 0px;
@@ -419,13 +423,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-
 #permalink {
   z-index: 10000;
   position: absolute;
@@ -441,12 +438,9 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
-div.olControlZoom a {
-  margin: 0 !important;
-}
-
-div.olControlZoom a.olControlZoomIn {
-    border-bottom: 0;
+.site-index .leaflet-top,
+.site-export .leaflet-top {
+  margin-top: 40px !important;
 }
 
 /* Rules for edit menu */
@@ -497,7 +491,7 @@ div.olControlZoom a.olControlZoomIn {
 #sidebar {
   display: none;
   position: absolute;
-  margin: 0px;
+  margin: 30px 0px 0px 0px;
   padding: 0px;
   width: 30%;
   top: 0px;
@@ -521,7 +515,7 @@ div.olControlZoom a.olControlZoomIn {
   height: 29px;
   font-size: 14px;
   line-height: 15px;
-  background: #bbb;
+  background: #ccc;
 }
 
 /* Rules for the map key which appears in the popout sidebar */
@@ -633,19 +627,26 @@ div.olControlZoom a.olControlZoomIn {
 /* Rules for the main content area */
 
 #content {
-  padding: 10px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+  padding: 20px;
+  margin: 30px 0px 0px 0px;
 }
 
-.site-index #content,
 .site-edit #content,
+.site-index #content,
 .site-export #content {
-  border: 0px;
+  position: fixed;
+  margin-top: 0px;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;
   padding: 0px;
 }
 
+.site-edit #content {
+  top: 30px;
+}
+
 #slim_container {
   width: 100%;
 }
@@ -1004,16 +1005,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {
   display: none;
 }
 
-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {
   display: block;
 }
 
 /* Rules for user popups on maps */
 
+.user_popup {
+  min-width: 200px;
+}
+
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;