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

[rails.git] / app / views / shared / _richtext_field.html.erb

diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb
index 96b90c4adb0b571ce594f6faf647d21af93c81e6..22b3db54228fbd1d03e2eb5d43c138acb65dba87 100644 (file)
--- a/app/views/shared/_richtext_field.html.erb
+++ b/app/views/shared/_richtext_field.html.erb
@@ -1,17 +1,14 @@
-<div class="form-group">
-  <label><%= object.class.human_attribute_name(attribute) %></label>
-  <div id="<%= id %>_container" class="form-row richtext_container">
-    <div id="<%= id %>_content" class="col-sm-8 mb-3 richtext_content">
-      <%= builder.text_area(attribute, options.merge(:wrapper => false, "data-preview-url" => preview_url(:type => type))) %>
-      <div id="<%= id %>_preview" class="richtext_preview richtext text-break"></div>
-    </div>
-    <div id="<%= id %>_help" class="col-sm-4 richtext_help">
-      <div class="card bg-light">
-        <div class="card-body">
-          <%= render :partial => "shared/#{type}_help" %>
-          <%= submit_tag t(".edit"), :id => "#{id}_doedit", :class => "richtext_doedit btn btn-primary", :disabled => true %>
-          <%= submit_tag t(".preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview btn btn-primary" %>
-        </div>
+<div id="<%= id %>_container" class="row richtext_container">
+  <div id="<%= id %>_content" class="col-sm-8 mb-3 mb-sm-0 richtext_content">
+    <%= builder.text_area(attribute, options.merge(:wrapper => false, "data-preview-url" => preview_url(:type => type))) %>
+    <div id="<%= id %>_preview" class="richtext_preview richtext text-break"></div>
+  </div>
+  <div id="<%= id %>_help" class="col-sm-4 richtext_help">
+    <div class="card bg-light h-100">
+      <div class="card-body">
+        <%= render :partial => "shared/#{type}_help" %>
+        <%= submit_tag t(".edit"), :id => "#{id}_doedit", :class => "richtext_doedit btn btn-primary", :disabled => true %>
+        <%= submit_tag t(".preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview btn btn-primary" %>
       </div>
     </div>
   </div>