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

diff --git a/app/assets/images/browse/alpinehut.p.16.png b/app/assets/images/browse/alpinehut.p.16.png
deleted file mode 100644 (file)
index 0499c58..0000000
Binary files a/app/assets/images/browse/alpinehut.p.16.png and /dev/null differ

diff --git a/app/assets/images/browse/tourism_alpine_hut.16.png b/app/assets/images/browse/tourism_alpine_hut.16.png
new file mode 100644 (file)
index 0000000..adeb457
Binary files /dev/null and b/app/assets/images/browse/tourism_alpine_hut.16.png differ

diff --git a/app/assets/images/browse/tourism_wilderness_hut.16.png b/app/assets/images/browse/tourism_wilderness_hut.16.png
new file mode 100644 (file)
index 0000000..33ccbfb
Binary files /dev/null and b/app/assets/images/browse/tourism_wilderness_hut.16.png differ

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 2db397a07f8ce1332c50dbe45334bd8d12402dfb..0c532733e915b48ebafda4ade0569487f91a9709 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -121,7 +121,7 @@
   .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'); }
@@ -130,6 +130,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.wilderness_hut::before { content: image-url('browse/tourism_wilderness_hut.16.png'); }
 
   /* Ways */