summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-26 18:02:20 +0100
committerAzul <azul@riseup.net>2016-05-02 08:31:17 -0300
commita0d9fbc4bcbd2f37e8d86d99c2e01753eecb14d7 (patch)
tree5ecd30f9ab33648cf19b98bae7abf79a24187fbf
parentde8f3e532d857ec64a9ba17bf9e5a4de272a6cbd (diff)
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.
-rw-r--r--app/assets/stylesheets/application.scss1
-rw-r--r--app/helpers/application_helper.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e6eeda2..856a559 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,6 +9,7 @@
//
// import bootstrap.
//
+@import "bootstrap-sprockets";
@import "bootstrap";
//
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)
- "<i class=\"icon-#{name} #{color_class(color)}\"></i> ".html_safe
+ "<span class=\"glyphicon glyphicon-#{name} #{color_class(color)}\"></span> ".html_safe
end
def big_icon(name, color=nil)