From 53e3a1f37971502ed644ec088b13f5a73500870d Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Mon, 19 Oct 2015 14:10:36 +0200
Subject: [PATCH] style bulkAction

---
 .../app/views/agent_ticket_view/bulk.jst.eco  |  8 +++----
 app/assets/stylesheets/zammad.scss            | 23 ++++++++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
index b99d8558b..f1a7145d5 100644
--- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
@@ -1,13 +1,13 @@
 <form class="update-box bulkAction-form" role="form">
-  <div class="horizontal center bulkAction-firstStep js-action-step">
+  <div class="bulkAction-firstStep js-action-step">
     <div id="form-ticket-bulk" class="form-inline form-inline--enclosed flex"></div>
     <div class="btn btn--primary js-confirm"><%- @T('Confirm') %></div>
   </div>
-  <div class="vertical hide bulkAction-secondStep js-confirm-step">
-    <div id="form-ticket-bulk-comment" class="form-inline horizontal"></div>
+  <div class="hide bulkAction-secondStep js-confirm-step">
+    <div id="form-ticket-bulk-comment" class="form-inline"></div>
     <div class="horizontal">
       <div id="form-ticket-bulk-typeVisibility" class="form-inline"></div>
-      <div class="bulkAction-controls align-right">
+      <div class="bulkAction-controls">
         <a class="btn btn--text btn--secondary js-cancel"><%- @T( 'Go Back' ) %></a>
         <input type="submit" class="btn btn--primary js-submit" value="<%- @T('Update') %>">
       </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 12c0c0688..0d8775586 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2155,12 +2155,27 @@ footer {
     0 -3px rgba(0,0,0,.01);
 }
 
+  .bulkAction-firstStep {
+    display: flex;
+    align-items: center;
+  }
+
+  .bulkAction-secondStep {
+    display: flex;
+    flex-direction: column;
+  }
+
   .bulkAction .btn {
-    margin: 0 10px;
+    margin: 0 16px;
+  }
+
+  .bulkAction .btn--text {
+    margin-right: 0;
   }
 
   .bulkAction-controls {
     margin-top: 10px;
+    margin-left: auto;
   }
 
 .show_toogle {
@@ -3558,12 +3573,14 @@ footer {
 
     .bulkAction-secondStep .form-inline textarea.form-control {
       display: block;
-      padding-left: 8px;
-      padding-right: 8px;
       width: 100%;
       resize: vertical;
     }
 
+    .bulkAction-secondStep .form-inline .expanding-wrapper {
+      margin: 0 6px;
+    }
+
     .bulkAction-secondStep .form-inline textarea.form-control:not(:focus) {
       border-color: #f0f0f0;
     }