Просмотр исходного кода

fix profile ticket-list layout

Felix Niklas 9 лет назад
Родитель
Сommit
c6a051af43

+ 1 - 1
app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco

@@ -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">

+ 1 - 1
app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco

@@ -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">

+ 38 - 8
app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco

@@ -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>
-          <div class="profile-ticketsPlaceholder vertical centered">
-            <svg class="stat-icon mood-icon"><use xlink:href="#icon-mood-supergood" /></svg>
-            Keine offenen Tickets
-          </div>
-          <a href="#">Alle Tickets von Doreen Kubiak …</a>
+          <label>Bearbeitete Tickets (12)</label>
+          <ol class="tasks tasks--standalone">
+            <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">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">

+ 1 - 1
app/assets/javascripts/app/views/widget/ticket_stats.jst.eco

@@ -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>

+ 7 - 5
app/assets/stylesheets/zammad.css.scss

@@ -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;
-  
-  &:not(:last-child) {
-    margin-right: 50px;
-  }
+  flex: 1 1 50%;
+  padding: 0 25px;
 
 
   .tasks {
   .tasks {
     display: flex;
     display: flex;