Merge branch 'master' into feature/budget_phases

2018-01-16 17:47:47 +01:00
parent 005d08e718 a215c9c603
commit d44db9cec4
26 changed files with 166 additions and 76 deletions
--- a/app/helpers/map_locations_helper.rb
+++ b/app/helpers/map_locations_helper.rb
@@ -34,11 +34,11 @@ module MapLocationsHelper
  end

  def map_location_remove_marker(map_location, text)
-    content_tag :div, class: "text-right" do
+    content_tag :div, class: "margin-bottom" do
      content_tag :a,
                  id: map_location_remove_marker_link_id(map_location),
                  href: "#",
-                  class: "location-map-remove-marker-button delete" do
+                  class: "js-location-map-remove-marker location-map-remove-marker" do
        text
      end
    end