From c6a051af43eb19bb450348045b52b16e35dbbe57 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 3 Jun 2015 10:26:51 +0200 Subject: [PATCH] fix profile ticket-list layout --- .../app/views/layout_ref/local_modal.jst.eco | 2 +- .../layout_ref/organization_profile.jst.eco | 2 +- .../app/views/layout_ref/user_profile.jst.eco | 46 +++++++++++++++---- .../app/views/widget/ticket_stats.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 12 +++-- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco index dfa2a6ac3..d0780b536 100644 --- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -360,7 +360,7 @@
Tickets von Steuerbüro C. Kaik
-
+
diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco index 4a50391c9..9ff6d768e 100644 --- a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco @@ -70,7 +70,7 @@
-
+
    diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index 9a2d95716..d9bd85f26 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -62,14 +62,44 @@
    Tickets von Steuerbüro C. Kaik
-
+
- -
- - Keine offenen Tickets -
- Alle Tickets von Doreen Kubiak … + +
    +
  1. +
    + +
    +
    +
    Micro-SIM doesn't work
    +
    23 minutes ago
    +
    +
  2. +
    + +
    +
    +
    Superb Service!
    +
    43 minutes ago
    +
    +
  3. +
    + +
    +
    +
    Print sheets strip off with a lot of text in the headline
    +
    1 hour ago
    +
    +
  4. +
    + +
    +
    +
    Block not properly wrought
    +
    2 hour ago
    +
    +
+ Alle Tickets von Steuerbüro C. Kaik …
@@ -95,7 +125,7 @@
-
Print sheets strip off
+
Print sheets strip off with a lot of text in the headline
1 hour ago
  • diff --git a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco index ed3d8fb54..2f3bedd2d 100644 --- a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco +++ b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco @@ -6,7 +6,7 @@ <% end %>
    -
    +
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index e32ca012a..5e36d67e4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4874,14 +4874,16 @@ label + .wizard-buttonList { } } +.profile-ticketLists { + display: flex; + margin: 0 -25px; +} + .profile-ticketList { display: flex; flex-direction: column; - flex: 1; - - &:not(:last-child) { - margin-right: 50px; - } + flex: 1 1 50%; + padding: 0 25px; .tasks { display: flex;