Merge branch 'leaflet'

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

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index a955017757f6cb675d4fc0642672d6c6c766489b..e690924b57d927e5e77ea19778bb3a6041ebf2fb 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -19,6 +19,7 @@ h1 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
+  left: 0;
   margin: 0px;
   height: 39px;
   padding: 0;
@@ -48,6 +49,7 @@ h1 {
   height: 16px;
   display: block;
   position: absolute;
+  left: 5px;
   top: 5px;
   padding: 2px;
   width: 110px; /* TODO: find better fix for overlap */
@@ -70,6 +72,7 @@ h1 {
 
 #greeting {
   position: absolute;
+  right: 5px;
   top: 5px;
   height: 14px;
   font-size: 12px;
@@ -92,14 +95,12 @@ h1 {
   border: 0;
 }
 
-.olControlSimplePanZoom {
+.leaflet-control-pan, .leaflet-control-zoomslider {
   display: none;
 }
 
-.site-index #map .olControlZoom,
-.site-index #map .SimpleLayerSwitcher,
-.site-export #map .olControlZoom,
-.site-export #map .SimpleLayerSwitcher {
+.site-index .leaflet-top,
+.site-export .leaflet-top {
   top: 8px !important;
 }
 
@@ -112,6 +113,8 @@ h1 {
   border-right: 0px;
 }
 
+.site-export #content,
+.site-edit #content,
 .site-index #content {
   margin-top: 40px;
 }