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

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

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index b2194f627f973f42ed7cacae6958d473d5917256..7c6f4b36507dbf0eb7e4dca1c44592d2a3a74738 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -58,6 +58,7 @@
   .amenity.recycling::before { content: image-url('browse/amenity_recycling.16.png'); }
   .amenity.school::before { content: image-url('browse/education_school.p.16.png'); }
   .amenity.shelter::before { content: image-url('browse/shelter2.p.16.png'); }
   .amenity.recycling::before { content: image-url('browse/amenity_recycling.16.png'); }
   .amenity.school::before { content: image-url('browse/education_school.p.16.png'); }
   .amenity.shelter::before { content: image-url('browse/shelter2.p.16.png'); }

+  .amenity.taxi::before { content: image-url('browse/amenity_taxi.16.png'); }

   .amenity.telephone::before { content: image-url('browse/telephone.p.16.png'); }
   .amenity.theatre::before { content: image-url('browse/amenity_theatre.16.png'); }
   .amenity.toilets::before { content: image-url('browse/amenity_toilets.16.png'); }
   .amenity.telephone::before { content: image-url('browse/telephone.p.16.png'); }
   .amenity.theatre::before { content: image-url('browse/amenity_theatre.16.png'); }
   .amenity.toilets::before { content: image-url('browse/amenity_toilets.16.png'); }


@@ -73,7 +74,7 @@
   .highway.traffic_signals::before { content: image-url('browse/traffic_light.png'); }
   .highway.turning_circle::before { content: image-url('browse/turning_circle.p.16.png'); }
 
   .highway.traffic_signals::before { content: image-url('browse/traffic_light.png'); }
   .highway.turning_circle::before { content: image-url('browse/turning_circle.p.16.png'); }
 

-  .historic.archaeological_site { content: image-url('browse/historic_archaeological_site.16.png'); }
+  .historic.archaeological_site::before { content: image-url('browse/historic_archaeological_site.16.png'); }

   .historic.castle::before { content: image-url('browse/tourist_castle.p.16.png'); }
   .historic.memorial::before { content: image-url('browse/historic_memorial.16.png'); }
   .historic.monument::before { content: image-url('browse/historic_monument.16.png'); }
   .historic.castle::before { content: image-url('browse/tourist_castle.p.16.png'); }
   .historic.memorial::before { content: image-url('browse/historic_memorial.16.png'); }
   .historic.monument::before { content: image-url('browse/historic_monument.16.png'); }


@@ -81,7 +82,8 @@
   .historic.wreck::before { content: image-url('browse/tourist_wreck.p.16.png'); }
 
   .man_made.lighthouse::before { content: image-url('browse/man_made_lighthouse.16.png'); }
   .historic.wreck::before { content: image-url('browse/tourist_wreck.p.16.png'); }
 
   .man_made.lighthouse::before { content: image-url('browse/man_made_lighthouse.16.png'); }

-  .man_made.windmill::before { content: image-url('browse/tourist_windmill.p.16.png'); }
+  .man_made.water_tower::before { content: image-url('browse/man_made_water_tower.16.png'); }
+  .man_made.windmill::before { content: image-url('browse/man_made_windmill.16.png'); }

 
   .natural.tree::before { content: image-url('browse/tree.p.16.png'); }
 
 
   .natural.tree::before { content: image-url('browse/tree.p.16.png'); }
 


@@ -90,12 +92,13 @@
   .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.butcher::before { content: image-url('browse/shop_butcher.p.16.png'); }
   .shop.clothes::before { content: image-url('browse/shop_clothes.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.butcher::before { content: image-url('browse/shop_butcher.p.16.png'); }
   .shop.clothes::before { content: image-url('browse/shop_clothes.16.png'); }

+  .shop.car_parts::before { content: image-url('browse/shop_car_parts.16.png'); }

   .shop.car_repair::before { content: image-url('browse/shop_car_repair.16.png'); }
   .shop.convenience::before { content: image-url('browse/shop_convenience.p.16.png'); }
   .shop.diy::before { content: image-url('browse/shop_doityourself.16.png'); }
   .shop.car_repair::before { content: image-url('browse/shop_car_repair.16.png'); }
   .shop.convenience::before { content: image-url('browse/shop_convenience.p.16.png'); }
   .shop.diy::before { content: image-url('browse/shop_doityourself.16.png'); }


@@ -118,15 +121,16 @@
   .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.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/hostel.p.16.png'); }
-  .tourism.hotel::before { content: image-url('browse/hotel.p.16.png'); }
+  .tourism.hostel::before { content: image-url('browse/tourism_hostel.16.png'); }
+  .tourism.hotel::before { content: image-url('browse/tourism_hotel.16.png'); }

   .tourism.motel::before { content: image-url('browse/tourism_motel.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.motel::before { content: image-url('browse/tourism_motel.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 */
 


@@ -160,14 +164,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'); }


@@ -175,9 +181,13 @@
   .leisure.playground::before { content: image-url('browse/leisure_playground.16.png'); }
   .leisure.pitch::before { content: image-url('browse/pitch.png'); }
   .leisure.nature_reserve::before { content: image-url('browse/reserve.png'); }
   .leisure.playground::before { content: image-url('browse/leisure_playground.16.png'); }
   .leisure.pitch::before { content: image-url('browse/pitch.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'); }