From 640e8cbbe84ff6c44db4666ee7cbdbba0268fe0f Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Thu, 12 May 2016 10:35:43 +0200
Subject: [PATCH 1/2] fix attachment close x position

---
 app/assets/stylesheets/zammad.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 173b27a0a..52fdc90c2 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -4556,7 +4556,7 @@ footer {
       margin: 0 0 4px;
     }
 
-    .attachments .icon {
+    .attachments .icon-paperclip {
       position: absolute;
       left: 33px;
       top: 27px;

From a082e6ca14f7c82d3c3d6a705a1cb28a50381df9 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Thu, 12 May 2016 10:48:28 +0200
Subject: [PATCH 2/2] add richtext-content class for richtext formating

and style <pre>
---
 .../javascripts/app/views/generic/richtext.jst.eco   |  2 +-
 .../app/views/ticket_zoom/article_new.jst.eco        |  2 +-
 .../app/views/ticket_zoom/article_view.jst.eco       |  2 +-
 app/assets/stylesheets/zammad.scss                   | 12 ++++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/richtext.jst.eco b/app/assets/javascripts/app/views/generic/richtext.jst.eco
index 594c3eb92..76c7cd061 100644
--- a/app/assets/javascripts/app/views/generic/richtext.jst.eco
+++ b/app/assets/javascripts/app/views/generic/richtext.jst.eco
@@ -1,3 +1,3 @@
 <div class="richtext form-control">
-  <div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="<%= @attribute.class %>"><%- @attribute.value %></div>
+  <div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>"><%- @attribute.value %></div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
index e0a065a7f..122a7ebcd 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
@@ -50,7 +50,7 @@
 
       <div class="textBubble js-writeArea">
         <div class="bubble-arrow"></div>
-        <div class="js-textarea articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
+        <div class="js-textarea richtext-content articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
         <!-- .textBubble grows with textarea (and expanding clone) -->
         <div class="textBubble-footer js-textSizeLimit">
           <div class="textBubble-signatur"><span class="js-signature"></span></div>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
index 07e603157..9a44c256a 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
@@ -41,7 +41,7 @@
       <div class="textBubble">
         <div class="bubble-arrow"></div>
         <div class="textBubble-content" id="article-content-<%= @article.id %>" data-id="<%= @article.id %>">
-          <%- @article.html %>
+          <div class="richtext-content"><%- @article.html %></div>
           <div class="textBubble-overflowContainer hide">
             <div class="btn btn--text js-unfold"><%- @T('See more') %></div>
           </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 52fdc90c2..b33540e1b 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -8124,6 +8124,18 @@ output {
   animation: pulsate 667ms ease-in-out infinite alternate;
 }
 
+.richtext-content pre {
+  padding: 15px;
+  font-size: 13px;
+  line-height: 1.45;
+  margin: 10px 0;
+  background: hsl(0,0%,97%);
+  white-space: pre-wrap;
+  border-radius: 3px;
+  border: none;
+  overflow: auto;
+}
+
 /*
 
   ----------------