Permalink
Browse files

bugfix ....

  • Loading branch information...
1 parent dc87854 commit af25497eae52695972919a171ca6ac9a831de1ab @mcanato committed Jul 19, 2012
Showing with 3 additions and 4 deletions.
  1. +3 −4 lib/twitter-bootstrap-markup-rails/components/button.rb
@@ -30,7 +30,8 @@ def default_options
:disabled => false,
:dropdown => false,
:id => nil,
- :icon => {},
+ :icon_name => nil,
+ :icon_color => :black,
:html_options => {}
}
end
@@ -45,12 +46,10 @@ def build_class
end
def build_icon
-=begin
if (options[:icon][:color].eql?(:white) || options[:type].blank?)
options[:icon] = { :color => :white }
end
-=end
- Icon.new(options[:icon]).to_s
+ Icon.new(:name => options[:icon_name], :color => options[:icon_color]).to_s
end
def build_caret

0 comments on commit af25497

Please sign in to comment.