Merge remote-tracking branch 'upstream/pull/2431'

[rails.git] / app / views / reports / new.html.erb

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index 599456db2ed1b37250408f9257a2e946b1068d38..a29104ae7874a7a7569b7fc760437d931a582dec 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -2,9 +2,9 @@
   <h1><%= t ".title_html", :link => link_to(reportable_title(@report.issue.reportable), reportable_url(@report.issue.reportable)) %></h1>
 <% end %>
 
-<div class="alert alert-warning report-disclaimer">
+<div class="alert alert-warning">
   <%= t(".disclaimer.intro") %>
-  <ul>
+  <ul class="mb-0">
     <li> <%= t(".disclaimer.not_just_mistake") %> </li>
     <li> <%= t(".disclaimer.unable_to_fix") %> </li>
     <li> <%= t(".disclaimer.resolve_with_user") %> </li>
@@ -13,25 +13,25 @@
 
 <%= form_for(@report) do |f| %>
   <%= f.error_messages %>
-  <fieldset>
+  <fieldset class="standard-form">
     <%= f.fields_for @report.issue do |issue_form| %>
       <%= issue_form.hidden_field :reportable_id %>
       <%= issue_form.hidden_field :reportable_type %>
     <% end %>
 
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <p><%= t(".select") %></p>
-      <ul>
+      <ul class="form-list">
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>
           <%= radio_button :report, :category, c, :required => true %>
-          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %> <br />
+          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %>
         </li>
       <% end %>
       </ul>
     </div>
 
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t(".details") %>
     </div>