More refactoring of map js

[rails.git] / app / assets / stylesheets / leaflet-all.css.scss

diff --git a/app/assets/stylesheets/leaflet-all.css.scss b/app/assets/stylesheets/leaflet-all.css.scss
index 3d9c381c0960392644b5434536431ea877360a6b..95f89bd2b496f87d86bf249f3b42f2f3f383a453 100644 (file)
--- a/app/assets/stylesheets/leaflet-all.css.scss
+++ b/app/assets/stylesheets/leaflet-all.css.scss
@@ -1,23 +1,10 @@
 /*
  *= require leaflet
  *= require leaflet.locationfilter
 /*
  *= require leaflet
  *= require leaflet.locationfilter

- *= require leaflet.pan
- *= require leaflet.zoom
+ *= require map-ui

  */
 
 /* Override to serve images through the asset pipeline. */
  */
 
 /* Override to serve images through the asset pipeline. */

-.leaflet-control-zoom-in {
-  background-image: image-url("images/zoom-in.png");
-}
-
-.leaflet-control-zoom-out {
-  background-image: image-url("images/zoom-out.png");
-}
-
-.leaflet-control-layers-toggle {
-  background-image: image-url("images/layers.png");
-}
-

 div.leaflet-marker-icon.location-filter.resize-marker {
   background-image: image-url("img/resize-handle.png");
 }
 div.leaflet-marker-icon.location-filter.resize-marker {
   background-image: image-url("img/resize-handle.png");
 }


@@ -26,13 +13,6 @@ div.leaflet-marker-icon.location-filter.move-marker {
   background-image: image-url("img/move-handle.png");
 }
 
   background-image: image-url("img/move-handle.png");
 }
 

-/* Override to better match the pan/zoom control. */
-.leaflet-control-layers {
-  box-shadow: 0px 0px 3px #666;
-  background: #fff;
-  border-radius: 3px;
-}
-

 /* Override some conflicting styles.
    https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
 .leaflet-popup-content img.user_thumbnail {
 /* Override some conflicting styles.
    https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
 .leaflet-popup-content img.user_thumbnail {


@@ -40,5 +20,19 @@ div.leaflet-marker-icon.location-filter.move-marker {
 }
 
 .user_popup p {
 }
 
 .user_popup p {

-  margin: 0px 2px 0px 55px !important;
+  margin: 0 !important;
+}
+
+.site .leaflet-popup p {
+  margin: 0 0 20px 0;
+}
+
+.leaflet-control-attribution #permalinkanchor {
+  background: image-url("sprite.png") 0 -45px no-repeat;
+  padding-left:20px;
+}
+
+.site .leaflet-control-attribution {
+  box-shadow: none;
+  font-size: inherit;

 }
 }