From cb13722b7de40870823575e85607aa7b10d7204a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:34:28 +0100 Subject: [PATCH] fix deformed avatar bug in FF --- .../layout_ref/communication_overview.jst.eco | 18 +-- .../views/ticket_zoom/article_view.jst.eco | 6 +- .../app/views/ticket_zoom/edit.jst.eco | 127 +++++++++--------- app/assets/stylesheets/zammad.css.scss | 52 +++---- 4 files changed, 103 insertions(+), 100 deletions(-) diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 3016ce3c7..dd73a13a9 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -44,7 +44,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
NB
Welcome! @@ -98,7 +98,7 @@ The Zammad
-
+
@@ -109,8 +109,8 @@ The Zammad
-
- +
+
Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
@@ -136,7 +136,7 @@ The Zammad
-
+
@@ -147,7 +147,7 @@ The Zammad
-
+
NB
Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. @@ -182,7 +182,7 @@ Grüße, Peter
-
+
@@ -193,7 +193,7 @@ Grüße, Peter
-
+
Lieber HP,
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 96fbba45b..362003e9e 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 @@ -1,5 +1,5 @@ <% for article in @articles: %> -
+
@@ -33,14 +33,14 @@
-
+
<% if article.sender.name isnt 'Agent': %> <% position = 'left' %> <% else: %> <% position = 'right' %> <% end %> <%- article.created_by.avatar("40", position) %> -
+
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco index 5d2f7a260..4eef2a887 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco @@ -2,87 +2,84 @@ -
-
- <%- App.User.fullLocal( @S('id') ).avatar("40", 'right', 'zIndex-5') %> -
-
-
-
-
-
- <% for atricleType in @articleTypes: %> -
-
-
- <% end %> -
-
+
+ <%- App.User.fullLocal( @S('id') ).avatar("40", 'right', 'zIndex-5') %> +
+
+
-
-
"> -
-
-
"> -
+
+
+ <% for atricleType in @articleTypes: %> +
+
+
+ <% end %>
-
+
+
"> +
+
+
"> +
+
+
+
+
-
+
-
-
- -
-
+
+
+
-
-
- -
-
+
+
+
+
+
+
+
-
-
-
<%- @article.body %>
- -
-
-
- <%- @T('Antwort eingeben oder') %> - - <%- @T('Dateien wählen..') %> - - -
-
-
-
- <%- @T(' Uploading ') %> (0%) ... -
-
-
<%- @T('Cancel Upload') %> -
+
+
+
<%- @article.body %>
+ +
+
+
+ <%- @T('Antwort eingeben oder') %> + + <%- @T('Dateien wählen..') %> + + +
+
+
+
+ <%- @T(' Uploading ') %> (0%) ... +
+
+
<%- @T('Cancel Upload') %>
-
+
-
-
- <%- @T('Drop Files here') %> -
+
+
+
+ <%- @T('Drop Files here') %>
-
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index a049c4fcf..3abc78dd9 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2970,6 +2970,13 @@ footer { margin-top: 55px; } +.ticket-article, +.ticket-edit { + max-width: 800px; + margin: 0 auto; + padding: 0 21px; +} + .ticket-title { max-width: 800px; padding: 0 81px; @@ -2990,24 +2997,20 @@ footer { display: block; } -.bubble-grid { - max-width: 800px; - margin: 0 auto; - padding: 0 21px; -} - - .bubble-gap { - margin-left: 15px !important; - } - - .customer.ticket-article-item .bubble-gap { - margin-left: 0 !important; - margin-right: 15px !important; - } - .ticket-article-item { padding-bottom: 33px; position: relative; + + .avatar { + position: absolute; + right: 0; + top: 5px; + } + + &.agent .avatar { + right: auto; + left: 0; + } } /* @@ -3019,20 +3022,16 @@ footer { overflow: hidden; position: relative; height: 100%; + margin: 0 55px; } .article-content { position: relative; - margin-right: 55px; + padding: 0 55px; } - .customer.ticket-article-item .article-content { - margin-right: 0; - margin-left: 55px; - } .article-content-meta { - padding: 0 55px; position: absolute; width: 100%; } @@ -3054,7 +3053,7 @@ footer { } .article-meta-key { - width: 13%; + width: 20%; text-transform: uppercase; } @@ -3094,6 +3093,7 @@ footer { box-shadow: 0 0 1px rgba(0,0,0,.06) inset; position: relative; overflow-wrap: break-word; + word-wrap: break-word; } /* email css reset */ @@ -3211,6 +3211,10 @@ footer { vertical-align: top; } +.article-add { + position: relative; +} + .ticket-edit { margin-top: auto; margin-bottom: 36px; @@ -3230,7 +3234,9 @@ footer { } .editControls { - position: relative; + position: absolute; + left: 0; + top: 5px; } .editControls-item {