From 640e8cbbe84ff6c44db4666ee7cbdbba0268fe0f Mon Sep 17 00:00:00 2001 From: Felix Niklas 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 Date: Thu, 12 May 2016 10:48:28 +0200 Subject: [PATCH 2/2] add richtext-content class for richtext formating and style
---
 .../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 @@
 
-
<%- @attribute.value %>
+
<%- @attribute.value %>
\ 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 @@
-
<%- @article.body %>
+
<%- @article.body %>