Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:rafaelfranca/simple_form-bootstrap

  • Loading branch information...
commit d6bfe8af73dddd918768c65e5d6ad8905d8618f7 2 parents 55e2ceb + 27763e6
@carlosantoniodasilva carlosantoniodasilva authored
View
10 app/views/articles/_form.html.erb
@@ -1,5 +1,5 @@
<div class="well form-actions">
- <a href="#" class="btn primary left" data-code="show">
+ <a href="#" class="btn btn-primary left" data-code="show">
toggle code examples for each form element.
</a>
<a href='#' id='toggle-form' class='btn right'>
@@ -127,12 +127,12 @@ end
</pre>
<div class="form-actions">
- <%= f.button :submit, :class => 'primary' %>
- <%= button_tag 'Cancel', :type => :reset, :class => "btn" %>
+ <%= f.button :submit, :class => 'btn-primary' %>
+ <%= button_tag 'Cancel', :type => :reset, :class => "btn btn-danger" %>
</div>
<pre class='prettyprint linenums lang-rb'>
# SimpleForm buttons already receive the 'btn' class for Bootstrap.
- f.button :submit, :class =&gt; 'primary'
- button_tag 'Cancel', :type =&gt; :reset, :class =&gt; "btn"
+ f.button :submit, :class =&gt; 'btn-primary'
+ button_tag 'Cancel', :type =&gt; :reset, :class =&gt; "btn btn-danger"
</pre>
<% end %>
View
2  app/views/articles/index.html.erb
@@ -5,7 +5,7 @@
<h1>Listing articles</h1>
<div class="well">
- <%= link_to 'Create a new article and see how SimpleForm 2.0 works', new_article_path, :class => 'btn primary' %>
+ <%= link_to 'Create a new article and see how SimpleForm 2.0 works', new_article_path, :class => 'btn btn-primary' %>
</div>
<table class="table table-bordered table-striped">
Please sign in to comment.
Something went wrong with that request. Please try again.