Permalink
Browse files

Using Bootstrap 2.0.4 (2.1rc)

  • Loading branch information...
1 parent 41b4ae1 commit cf2cf3c2842c9166bc290728f37381d26f706fa2 @lucasmazza lucasmazza committed Aug 14, 2012
@@ -60,7 +60,7 @@ footer {
text-align: center;
}
-.navbar-fixed .brand {
+.navbar .brand {
float: right;
padding-right: 0;
}
@@ -95,14 +95,14 @@ simple_form_for(@article, :html => { :class => 'form-horizontal' }) do |f|
</pre>
<%= f.input :disabled_text, :wrapper => :prepend, :hint => 'This is the hint text' do %>
- <%= content_tag :label, :class => "add-on" do %>
+ <%= content_tag :span, :class => "add-on" do %>
<%= check_box_tag :remove, 'true' %>
<% end %>
<%= f.input_field :disabled_text, :disabled => true %>
<% end %>
<pre class='prettyprint linenums lang-rb'>
f.input :disabled_text, :wrapper =&gt; :prepend, :hint =&gt; "This is the hint text" do
- content_tag :label, :class =&gt; "add-on" do
+ content_tag :span, :class =&gt; "add-on" do
check_box_tag :remove, 'true'
end
f.input_field :disabled_text
@@ -111,7 +111,7 @@ end
<%= f.input :disabled_text, :wrapper => :append, :hint => 'This is the hint text' do %>
<%= f.input_field :disabled_text, :class => :mini, :disabled => true %>
- <%= content_tag :label, :class => "add-on active" do %>
+ <%= content_tag :span, :class => "add-on active" do %>
<%= check_box_tag :remove, 'true' %>
<% end %>
<% end %>
@@ -120,7 +120,7 @@ end
# Use the 'append' wrapper the same way as the 'prepend' one.
f.input :disabled_text, :wrapper =&gt; :append, :hint =&gt; "This is the hint text" do
f.input_field :disabled_text, :class =&gt; :mini
- content_tag :label, :class =&gt; "add-on active" do
+ content_tag :span, :class =&gt; "add-on active" do
check_box_tag :remove, 'true'
end
end
@@ -6,7 +6,9 @@
<%= csrf_meta_tags %>
</head>
<body>
- <header class="navbar navbar-fixed">
+
+
+ <header class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<a href="http://github.com/rafaelfranca/simple_form-bootstrap">
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/30f550e0d38ceb6ef5b81500c64d970b7fb0f028/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub">
Oops, something went wrong.

0 comments on commit cf2cf3c

Please sign in to comment.