From b08fe508880005c6a7c66f009df4c07b24a7dde1 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 14:32:24 +0100 Subject: [PATCH 1/6] fix inconsistent colours --- app/assets/stylesheets/zammad.css.scss | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index b4bc6b83e..a049c4fcf 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -18,7 +18,7 @@ p { } .u-highlight { - color: hsl(194,90%,45%); + color: #0F94D6; } a { @@ -752,6 +752,16 @@ textarea, border-color: #ececec; } +.pagination > .active > a, +.pagination > .active > span, +.pagination > .active > a:hover, +.pagination > .active > span:hover, +.pagination > .active > a:focus, +.pagination > .active > span:focus { + background: #0F94D6; + border-color: #0F94D6; +} + .pagination-counter { margin-right: 19px; line-height: 28px; @@ -1826,6 +1836,11 @@ footer { padding: 10px 20px; } +.tableOverview-edit { + @extend .u-clickable; + @extend .u-highlighted; +} + .bulkAction { background: white; z-index: 1; From 7b62f6cce1a25d2297fba0103c2a47f30928cebf Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:05:17 +0100 Subject: [PATCH 2/6] fix article actions order order after meta-data (test: click on article) --- .../views/ticket_zoom/article_view.jst.eco | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) 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 b14ab148a..96fbba45b 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 @@ -59,17 +59,6 @@ <% end %> - <% if article.actions: %> -
-
- <% for action in article.actions: %> - - <%- @T( action.name ) %> - - <% end %> -
-
- <% end %> @@ -90,6 +79,18 @@ + <% if article.actions: %> +
+
+ <% for action in article.actions: %> + + <%- @T( action.name ) %> + + <% end %> +
+
+ <% end %> + <% end %> \ No newline at end of file From ee6e89e3e9d71b73e92350b3c33186c61db78642 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:34:09 +0100 Subject: [PATCH 3/6] fix light phone cutoff --- public/assets/images/sprite.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg index 42f527c95..992dec70f 100644 --- a/public/assets/images/sprite.svg +++ b/public/assets/images/sprite.svg @@ -1,6 +1,6 @@ - - + + Slice 2 Created with Sketch. From cb13722b7de40870823575e85607aa7b10d7204a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:34:28 +0100 Subject: [PATCH 4/6] 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 { From 8d3da7c77d7905d29a09aafdb2ef115c0d14da63 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 16:25:39 +0100 Subject: [PATCH 5/6] fix extend typo --- app/assets/stylesheets/zammad.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 3abc78dd9..ccb71dbb5 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1838,7 +1838,7 @@ footer { .tableOverview-edit { @extend .u-clickable; - @extend .u-highlighted; + @extend .u-highlight; } .bulkAction { From c67048131cd3f4391daedbd0cda6be0207af3bad Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 16:38:08 +0100 Subject: [PATCH 6/6] add favicon --- public/favicon.ico | Bin 0 -> 32988 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cd31b71bfa442980691e9a91c8a1e9b0da6fe6b4 100644 GIT binary patch literal 32988 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

R~tW8@l90&e4K1bhf}bTWoryB%jKy zRh>6UPpPfyyR|3~O_Sqal~iy;qigf~ES9CbF-?2|=Jqg- zYy4~_&>@a;7vUY?uO(-=Y`c~A-t>Ku8C?!PP;T)R5Iq5$GjUn@iw`ed7fd7$=(;ZX zo!B0DHY8rPk4c(w4V$w{ly0_?(YoXTbEg$aXKap@-U;9kUB#9&cWY*BF2lQL%g!~G zp6sgveTUWlEoj88Ki>B#&pwj^^797H&HB#CP8PwKE2|tfEcK(N@_;=$<6*DPrSCsC ztSQe9;=x{=1!zQ$vB8*}y<;bccA5@NJ&vqI&m3