From 530ee4d734caabd770204b79fb706569bd58ada7 Mon Sep 17 00:00:00 2001
From: Sean Collins <sean@cllns.com>
Date: Wed, 25 Nov 2015 12:16:10 -0700
Subject: Remove <br> from scaffold, in favor of using CSS

---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 6 +++---
 railties/lib/rails/generators/rails/scaffold/templates/scaffold.css | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index d99b27cb2d..519b6c8603 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -14,15 +14,15 @@
 <% attributes.each do |attribute| -%>
   <div class="field">
 <% if attribute.password_digest? -%>
-    <%%= f.label :password %><br>
+    <%%= f.label :password %>
     <%%= f.password_field :password %>
   </div>
 
   <div class="field">
-    <%%= f.label :password_confirmation %><br>
+    <%%= f.label :password_confirmation %>
     <%%= f.password_field :password_confirmation %>
 <% else -%>
-    <%%= f.label :<%= attribute.column_name %> %><br>
+    <%%= f.label :<%= attribute.column_name %> %>
     <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
 <% end -%>
   </div>
diff --git a/railties/lib/rails/generators/rails/scaffold/templates/scaffold.css b/railties/lib/rails/generators/rails/scaffold/templates/scaffold.css
index b7818883d1..79f8b7f96f 100644
--- a/railties/lib/rails/generators/rails/scaffold/templates/scaffold.css
+++ b/railties/lib/rails/generators/rails/scaffold/templates/scaffold.css
@@ -78,3 +78,7 @@ div.actions {
   font-size: 12px;
   list-style: square;
 }
+
+label {
+  display: block;
+}
-- 
cgit v1.2.3