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

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

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index f497a22d86db7eb994ada531fbc07dc26110ed18..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'); }


@@ -92,7 +88,7 @@
   .railway.level_crossing::before { content: image-url('browse/level_crossing.p.16.png'); }
 
   .shop::before { content: image-url('browse/shop_convenience.p.16.png'); }
   .railway.level_crossing::before { content: image-url('browse/level_crossing.p.16.png'); }
 
   .shop::before { content: image-url('browse/shop_convenience.p.16.png'); }

-  .shop.alcohol::before { content: image-url('browse/shop_alcohol.16.pn'); }
+  .shop.alcohol::before { content: image-url('browse/shop_alcohol.16.png'); }

   .shop.bakery::before { content: image-url('browse/shop_bakery.16.png'); }
   .shop.bicycle::before { content: image-url('browse/shop_bicycle.16.png'); }
   .shop.books::before { content: image-url('browse/shop_books.16.png'); }
   .shop.bakery::before { content: image-url('browse/shop_bakery.16.png'); }
   .shop.bicycle::before { content: image-url('browse/shop_bicycle.16.png'); }
   .shop.books::before { content: image-url('browse/shop_books.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 */
 


@@ -163,14 +160,16 @@
   .landuse.brownfield::before { content: image-url('browse/brownfield.png'); }
   .landuse.cemetery::before { content: image-url('browse/cemetery.png'); }
   .landuse.commercial::before { content: image-url('browse/commercial.png'); }
   .landuse.brownfield::before { content: image-url('browse/brownfield.png'); }
   .landuse.cemetery::before { content: image-url('browse/cemetery.png'); }
   .landuse.commercial::before { content: image-url('browse/commercial.png'); }

-  .landuse.farm::before { content: image-url('browse/farm.png'); }
+  .landuse.farmland::before { content: image-url('browse/farmland.png'); }
+  .landuse.farmyard::before { content: image-url('browse/farmyard.png'); }

   .landuse.forest::before { content: image-url('browse/forest.png'); }
   .landuse.forest::before { content: image-url('browse/forest.png'); }

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

   .landuse.industrial::before { content: image-url('browse/industrial.png'); }
   .landuse.industrial::before { content: image-url('browse/industrial.png'); }

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

   .landuse.military::before { content: image-url('browse/military.png'); }
   .landuse.residential::before { content: image-url('browse/residential.png'); }
   .landuse.retail::before { content: image-url('browse/retail.png'); }
   .landuse.tourism::before { content: image-url('browse/tourism.png'); }
   .landuse.military::before { content: image-url('browse/military.png'); }
   .landuse.residential::before { content: image-url('browse/residential.png'); }
   .landuse.retail::before { content: image-url('browse/retail.png'); }
   .landuse.tourism::before { content: image-url('browse/tourism.png'); }

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

 
   .leisure.golf_course::before { content: image-url('browse/golf.png'); }
   .leisure.park::before { content: image-url('browse/park.png'); }
 
   .leisure.golf_course::before { content: image-url('browse/golf.png'); }
   .leisure.park::before { content: image-url('browse/park.png'); }


@@ -180,8 +179,11 @@
   .leisure.nature_reserve::before { content: image-url('browse/reserve.png'); }
   .leisure.water_park::before { content: image-url('browse/leisure_water_park.16.png'); }
 
   .leisure.nature_reserve::before { content: image-url('browse/reserve.png'); }
   .leisure.water_park::before { content: image-url('browse/leisure_water_park.16.png'); }
 

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

   .natural.heath::before { content: image-url('browse/heathland.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.water::before { content: image-url('browse/lake.png'); }

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

 
   .railway.light_rail::before { content: image-url('browse/light_rail.20.png'); }
   .railway.rail::before { content: image-url('browse/rail.20.png'); }
 
   .railway.light_rail::before { content: image-url('browse/light_rail.20.png'); }
   .railway.rail::before { content: image-url('browse/rail.20.png'); }