Skip to content

Commit

Permalink
Merge branch 'master' into feature/resource-whitelist-mime-types
Browse files Browse the repository at this point in the history
  • Loading branch information
bricesanchez committed Sep 20, 2018
2 parents e5aa92b + 9e82d1b commit 17d615a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions core/app/helpers/refinery/tag_helper.rb
Expand Up @@ -27,9 +27,8 @@ def action_label(action, url, title, options={})
action_icon_label(action, url, title, options, true)
end

# See icons.scss for defined icons/classes
def action_icon_label(action, url, title, options={}, label = true)
# See icons.scss for defined icons/classes

options[:title] = title
options[:class].presence ? options[:class] << " #{action}_icon " : options[:class] = "#{action}_icon"
options[:class] << ' icon_label' if label
Expand All @@ -54,4 +53,4 @@ def locale_text_icon(text)
end

end
end
end

0 comments on commit 17d615a

Please sign in to comment.