Merge remote-tracking branch 'upstream/pull/4654'

[rails.git] / app / assets / stylesheets / browse.scss

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 2db397a07f8ce1332c50dbe45334bd8d12402dfb..fe398bc5abf1d8c883811c6ff5bb78ca91e7de37 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -14,10 +14,6 @@
     margin-left: 25px;
   }
 
     margin-left: 25px;
   }
 

-  /* Deleted objects */
-
-  .deleted { text-decoration: line-through; }
-

   /* Nodes (and ways as areas) */
 
   .aeroway.aerodrome::before { content: image-url('browse/aerodrome.p.16.png'); }
   /* Nodes (and ways as areas) */
 
   .aeroway.aerodrome::before { content: image-url('browse/aerodrome.p.16.png'); }


@@ -121,7 +117,7 @@
   .shop.shoes::before { content: image-url('browse/shop_shoes.16.png'); }
   .shop.supermarket::before { content: image-url('browse/shop_supermarket.p.16.png'); }
 
   .shop.shoes::before { content: image-url('browse/shop_shoes.16.png'); }
   .shop.supermarket::before { content: image-url('browse/shop_supermarket.p.16.png'); }
 

-  .tourism.alpine_hut::before { content: image-url('browse/alpinehut.p.16.png'); }
+  .tourism.alpine_hut::before { content: image-url('browse/tourism_alpine_hut.16.png'); }

   .tourism.camp_site::before { content: image-url('browse/tourism_camp_site.16.png'); }
   .tourism.caravan_site::before { content: image-url('browse/tourism_caravan_site.16.png'); }
   .tourism.hostel::before { content: image-url('browse/tourism_hostel.16.png'); }
   .tourism.camp_site::before { content: image-url('browse/tourism_camp_site.16.png'); }
   .tourism.caravan_site::before { content: image-url('browse/tourism_caravan_site.16.png'); }
   .tourism.hostel::before { content: image-url('browse/tourism_hostel.16.png'); }


@@ -130,6 +126,7 @@
   .tourism.museum::before { content: image-url('browse/tourism_museum.16.png'); }
   .tourism.picnic_site::before { content: image-url('browse/tourism_picnic_site.16.png'); }
   .tourism.viewpoint::before { content: image-url('browse/view_point.p.16.png'); }
   .tourism.museum::before { content: image-url('browse/tourism_museum.16.png'); }
   .tourism.picnic_site::before { content: image-url('browse/tourism_picnic_site.16.png'); }
   .tourism.viewpoint::before { content: image-url('browse/view_point.p.16.png'); }

+  .tourism.wilderness_hut::before { content: image-url('browse/tourism_wilderness_hut.16.png'); }

 
   /* Ways */
 
 
   /* Ways */
 


@@ -184,6 +181,7 @@
 
   .natural.grassland::before { content: image-url('browse/grassland.png'); }
   .natural.heath::before { content: image-url('browse/heathland.png'); }
 
   .natural.grassland::before { content: image-url('browse/grassland.png'); }
   .natural.heath::before { content: image-url('browse/heathland.png'); }

+  .natural.scrub::before { content: image-url('browse/scrub.png'); }

   .natural.water::before { content: image-url('browse/lake.png'); }
   .natural.wood::before { content: image-url('browse/wood.png'); }
 
   .natural.water::before { content: image-url('browse/lake.png'); }
   .natural.wood::before { content: image-url('browse/wood.png'); }