BAP-20864: Wrong attachment field spacing and border in Add Comment p…

…opup dialog in back-office (#32909)
Dylvn · Jun 17, 2022 · f6f4e89 · f6f4e89
1 parent 8b34d9e
commit f6f4e89
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/Oro/Bundle/CommentBundle/Resources/views/Comment/form.html.twig b/src/Oro/Bundle/CommentBundle/Resources/views/Comment/form.html.twig
@@ -2,18 +2,22 @@
 
 <form method="post" class="comment-form">
     <fieldset class="form-horizontal">
-        <label class="comment-message-label">
-            {{ form_widget(form.message) }}
-        </label>
+        <div class="control-group">
+            <label class="comment-message-label">
+                {{ form_widget(form.message) }}
+            </label>
+        </div>
         {{ form_widget(form.attachment) }}
         <% if (attachmentURL) { %>
-        <div class="attachment-item">
-            <span class="attachment-item__icon fa-paperclip" aria-hidden="true"></span>
-            <a href="<%- attachmentURL.url %>" class="no-hash attachment-item__filename" title="<%- attachmentFileName %>"><%- attachmentFileName %></a>
-            <span class="attachment-item__file-size">(<%- attachmentSize %>)</span>
-            <button class="btn btn-icon btn-square-lighter attachment-item__remove" type="button" data-role="remove">
-                <span class="fa-close" aria-hidden="true"></span>
-            </button>
+        <div class="control-group">
+            <div class="attachment-item">
+                <span class="attachment-item__icon fa-paperclip" aria-hidden="true"></span>
+                <a href="<%- attachmentURL.url %>" class="no-hash attachment-item__filename" title="<%- attachmentFileName %>"><%- attachmentFileName %></a>
+                <span class="attachment-item__file-size">(<%- attachmentSize %>)</span>
+                <button class="btn btn-icon btn-square-lighter attachment-item__remove" type="button" data-role="remove">
+                    <span class="fa-close" aria-hidden="true"></span>
+                </button>
+            </div>
         </div>
         <% } %>
         <div class="widget-actions">

diff --git a/src/Oro/Bundle/NoteBundle/Resources/views/Note/dialog/update.html.twig b/src/Oro/Bundle/NoteBundle/Resources/views/Note/dialog/update.html.twig
@@ -17,10 +17,8 @@
             <form id="{{ form.vars.id }}" name="{{ form.vars.name }}" action="{{ formAction }}" method="post" class="note-form">
                 <fieldset class="form-horizontal">
                     {{ form_row(form.message) }}
-                    <div class="control-group">
-                        <div class="attachment-container">
-                            {{ form_widget(form.attachment) }}
-                        </div>
+                    <div class="control-group-container">
+                        {{ form_widget(form.attachment) }}
                     </div>
                     {{ form_rest(form) }}
                     <div class="widget-actions form-actions" style="display: none;">