From 9fe00faaf345f5efb2ecc2564286665cc2128ad5 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 7 Oct 2014 15:59:21 +0200
Subject: [PATCH] fix attachment position

---
 .../app/controllers/layout_ref.js.coffee        | 17 +++++++++++++++--
 .../app/controllers/ticket_zoom.js.coffee       | 17 +++++++++++++++--
 app/assets/stylesheets/zammad.css.scss.erb      | 11 ++++++++---
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
index 2554ac2d2..1eecf2ad0 100644
--- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee
+++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
@@ -135,6 +135,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
     '.attachmentUpload':            'attachmentUpload'
     '.attachmentUpload-progressBar':'progressBar'
     '.js-percentage':               'progressText'
+    '.text-bubble':                 'textBubble'
 
   events:
     'focus .js-textarea':                     'open_textarea'
@@ -196,12 +197,18 @@ class LayoutRefCommunicationReply extends App.ControllerContent
       @textarea.velocity
         properties:
           minHeight: "#{ @textareaHeight.open - 38 }px"
-          marginBottom: 38
         options:
           duration: duration
           easing: 'easeOutQuad'
           complete: => @add_textarea_catcher()
 
+      @textBubble.velocity
+        properties:
+          paddingBottom: 28
+        options:
+          duration: duration
+          easing: 'easeOutQuad'
+
       # scroll to bottom
       # @textarea.velocity "scroll",
       #   container: @textarea.scrollParent()
@@ -248,12 +255,18 @@ class LayoutRefCommunicationReply extends App.ControllerContent
       @textarea.velocity
         properties:
           minHeight: "#{ @textareaHeight.closed }px"
-          marginBottom: 0
         options:
           duration: 300
           easing: 'easeOutQuad'
           complete: => @ticketEdit.removeClass('is-open')
 
+      @textBubble.velocity
+        properties:
+          paddingBottom: 0
+        options:
+          duration: 300
+          easing: 'easeOutQuad'
+
       @attachmentPlaceholder.velocity
         properties:
           translateX: 0
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index 053b9fff8..67c60ffec 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -698,6 +698,7 @@ class Edit extends App.Controller
     '.attachmentUpload':            'attachmentUpload'
     '.attachmentUpload-progressBar':'progressBar'
     '.js-percentage':               'progressText'
+    '.text-bubble':                 'textBubble'
     '.edit-control-item':           'editControlItem'
     #'.edit-controls':               'editControls'
     #'.recipient-picker':            'recipientPicker'
@@ -975,12 +976,18 @@ class Edit extends App.Controller
       @textarea.velocity
         properties:
           minHeight: "#{ @textareaHeight.open - 38 }px"
-          marginBottom: 38
         options:
           duration: duration
           easing: 'easeOutQuad'
           complete: => @add_textarea_catcher()
 
+      @textBubble.velocity
+        properties:
+          paddingBottom: 28
+        options:
+          duration: duration
+          easing: 'easeOutQuad'
+
       # scroll to bottom
       @textarea.velocity "scroll",
         container: @textarea.scrollParent()
@@ -1027,12 +1034,18 @@ class Edit extends App.Controller
       @textarea.velocity
         properties:
           minHeight: "#{ @textareaHeight.closed }px"
-          marginBottom: 0
         options:
           duration: 300
           easing: 'easeOutQuad'
           complete: => @ticketEdit.removeClass('is-open')
 
+      @textBubble.velocity
+        properties:
+          paddingBottom: 0
+        options:
+          duration: 300
+          easing: 'easeOutQuad'
+
       @attachmentPlaceholder.velocity
         properties:
           translateX: 0
diff --git a/app/assets/stylesheets/zammad.css.scss.erb b/app/assets/stylesheets/zammad.css.scss.erb
index 80d1fd578..edead697c 100644
--- a/app/assets/stylesheets/zammad.css.scss.erb
+++ b/app/assets/stylesheets/zammad.css.scss.erb
@@ -472,11 +472,14 @@ textarea,
     box-shadow: 0 0 0 3px hsl(201,62%,90%);
   }
 
+  .richtext.form-control {
+    padding-bottom: 28px;
+  }
+
   .richtext.form-control [contenteditable] {
     height: auto;
     min-height: 82px;
     background: none;
-    margin-bottom: 28px;
   }
 
   .has-error .form-control,
@@ -2918,6 +2921,8 @@ footer {
     border-color: #b3b3b3;
     white-space: normal;
     border-radius: 5px;
+    padding-left: 12px;
+    padding-right: 12px;
   }
 
     .ticket-edit .text-bubble [contenteditable],
@@ -2954,10 +2959,10 @@ footer {
     overflow: hidden;
   }
 
-    .ticket-edit .attachments:not(:empty) {
+    .attachments:not(:empty) {
       padding: 9px 5px;
       border-top: 1px solid hsl(0,0%,93%);
-      margin: 0 -20px 50px;
+      margin: 6px -12px 30px;
     }
 
     .attachment {