From a0d9fbc4bcbd2f37e8d86d99c2e01753eecb14d7 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Mar 2016 18:02:20 +0100 Subject: upgrade bootstrap3 icons work now import bootstrap-sprockets; before importing bootstrap in the scss. bootstrap now uses glyphicons which are based on fonts. So we always should use a span. Not sure what to do with big and huge icons yet. --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/application_helper.rb') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6de5e1b..23b2752 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -19,7 +19,7 @@ module ApplicationHelper # http://twitter.github.io/bootstrap/base-css.html#icons # def icon(name, color=nil) - " ".html_safe + " ".html_safe end def big_icon(name, color=nil) -- cgit v1.2.3 From 500fa2db1d593131d7cebd127c941a44bf174223 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Mar 2016 18:42:36 +0100 Subject: use icon helper from navigation helper and use content_tag inside the icon helper... html_safe is evil. --- app/helpers/application_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/helpers/application_helper.rb') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 23b2752..920186d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -19,7 +19,8 @@ module ApplicationHelper # http://twitter.github.io/bootstrap/base-css.html#icons # def icon(name, color=nil) - " ".html_safe + content_tag :span, '', + class: "glyphicon glyphicon-#{name} #{color_class(color)}" end def big_icon(name, color=nil) -- cgit v1.2.3