From 9f841d2d47dd8a7af409d5e494569e6b56fe8511 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 8 Jun 2015 13:02:01 +0200 Subject: [PATCH] Linked Ticket - move to generic ticket list with icons like user profile --- .../javascripts/app/views/link/info.jst.eco | 15 ++++---- app/assets/stylesheets/zammad.css.scss | 34 +++++++++---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/assets/javascripts/app/views/link/info.jst.eco b/app/assets/javascripts/app/views/link/info.jst.eco index af021fe69..e9cf2f514 100644 --- a/app/assets/javascripts/app/views/link/info.jst.eco +++ b/app/assets/javascripts/app/views/link/info.jst.eco @@ -2,18 +2,21 @@ <% for type of @links: %> <% end %>
+ <%- @T('Add Link') %>
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 767b35afa..b5f1caf52 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -671,7 +671,7 @@ h5 { label, .checkbox.form-group label { text-transform: uppercase; - color: hsl(0,0%,60%); + color: hsl(198,19%,72%); display: block; font-size: 12px; font-weight: normal; @@ -1681,7 +1681,8 @@ footer { .tasks.tasks--standalone { background: none; - margin-top: 8px; + margin: 8px 0 0; + padding: 0; } .tasks--standalone .task { @@ -2177,6 +2178,7 @@ footer { width: 32%; max-width: 300px; padding: 20px; + color: hsl(60,1%,34%); background: white; border-right: 1px solid #e6e6e6; overflow: auto; @@ -3701,7 +3703,7 @@ footer { } .sidebar .text-muted { - color: hsl(204,3%,72%); + color: hsl(198,19%,72%); } .alert { @@ -3741,13 +3743,17 @@ footer { } .sidebar-list-title { - color: hsl(206,7%,28%); - text-transform: capitalize; margin-top: 7px; + margin-bottom: 4px; + text-transform: uppercase; + color: hsl(198,19%,84%); + display: block; + font-size: 12px; + font-weight: normal; + letter-spacing: 0.1em; } .sidebar-list-item { - padding: 4px 1px; display: flex; align-items: center; color: hsl(206,7%,28%); @@ -3756,15 +3762,16 @@ footer { .sidebar-list-item-name { flex: 1; + padding: 4px 1px; } .sidebar-list-item-delete { - height: 100%; padding: 0 10px; - margin-right: -4px; + margin-right: -3px; display: flex; align-items: center; justify-content: center; + align-self: stretch; @extend .u-clickable; .icon { @@ -5003,21 +5010,12 @@ label + .wizard-buttonList { padding: 0 25px; .tasks { + margin-bottom: 10px; display: flex; flex-direction: column; } } -.profile-ticketList { - ol { - padding: 0; - } - - .name { - @extend .u-highlight; - } -} - .profile .frequency.stat-widget { height: 230px;