Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix profile ticket-list layout

Browse source
This commit is contained in:
Felix Niklas 2015-06-03 10:26:51 +02:00
parent 9a18b99d18
commit c6a051af43
5 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
View file

@ -360,7 +360,7 @@
<div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div> <div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div>
</div> </div>
<!-- endif --> <!-- endif -->
<div class="profile-ticketLists horizontal"> <div class="profile-ticketLists">
<div class="profile-ticketList"> <div class="profile-ticketList">
<label>Offene Tickets (0)</label> <label>Offene Tickets (0)</label>
<div class="profile-ticketsPlaceholder vertical centered"> <div class="profile-ticketsPlaceholder vertical centered">

2
app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
View file

@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<div class="profile-section"> <div class="profile-section">
<div class="profile-ticketLists horizontal"> <div class="profile-ticketLists">
<div class="profile-ticketList"> <div class="profile-ticketList">
<label>Offene Tickets (23)</label> <label>Offene Tickets (23)</label>
<ol class="tasks tasks--standalone"> <ol class="tasks tasks--standalone">

46
app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
View file

@ -62,14 +62,44 @@
<div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div> <div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div>
</div> </div>
<!-- endif --> <!-- endif -->
<div class="profile-ticketLists horizontal"> <div class="profile-ticketLists">
<div class="profile-ticketList"> <div class="profile-ticketList">
<label>Offene Tickets (0)</label> <label>Bearbeitete Tickets (12)</label>
<div class="profile-ticketsPlaceholder vertical centered"> <ol class="tasks tasks--standalone">
<svg class="stat-icon mood-icon"><use xlink:href="#icon-mood-supergood" /></svg> <li class="task level-1">
Keine offenen Tickets <div class="icon-holder">
</div> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
<a href="#">Alle Tickets von Doreen Kubiak …</a> </div>
<div class="flex">
<div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div>
</div>
<li class="task level-1">
<div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div>
<div class="flex">
<div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div>
</div>
<li class="task level-1">
<div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div>
<div class="flex">
<div class="name">Print sheets strip off with a lot of text in the headline</div>
<div class="time">1 hour ago</div>
</div>
<li class="task level-1">
<div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div>
<div class="flex">
<div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div>
</div>
</ol>
<a href="#">Alle Tickets von Steuerbüro C. Kaik …</a>
</div> </div>
<div class="profile-ticketList"> <div class="profile-ticketList">
<label>Bearbeitete Tickets (12)</label> <label>Bearbeitete Tickets (12)</label>
@ -95,7 +125,7 @@
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="flex">
<div class="name">Print sheets strip off</div> <div class="name">Print sheets strip off with a lot of text in the headline</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
<li class="task level-1"> <li class="task level-1">

2
app/assets/javascripts/app/views/widget/ticket_stats.jst.eco
View file

@ -6,7 +6,7 @@
<% end %> <% end %>
<div class="js-user <% if !@user && @organization: %>hide<% end %>"> <div class="js-user <% if !@user && @organization: %>hide<% end %>">
<div class="profile-ticketLists horizontal"> <div class="profile-ticketLists">
<div class="profile-ticketList js-user-open-tickets"></div> <div class="profile-ticketList js-user-open-tickets"></div>
<div class="profile-ticketList js-user-closed-tickets"></div> <div class="profile-ticketList js-user-closed-tickets"></div>
</div> </div>

12
app/assets/stylesheets/zammad.css.scss
View file

@ -4874,14 +4874,16 @@ label + .wizard-buttonList {
} }
} }
.profile-ticketLists {
display: flex;
margin: 0 -25px;
}
.profile-ticketList { .profile-ticketList {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1 1 50%;
padding: 0 25px;
&:not(:last-child) {
margin-right: 50px;
}
.tasks { .tasks {
display: flex; display: flex;