Browse Source

Merge branch 'develop' of github.com:martini/zammad into develop

Martin Edenhofer 9 years ago
parent
commit
d790947617

+ 4 - 4
app/assets/javascripts/app/views/agent_ticket_create.jst.eco

@@ -70,7 +70,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -78,7 +78,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service!</div>
                 <div class="time">43 minutes ago</div>
               </div>
@@ -86,7 +86,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Print sheets strip off</div>
                 <div class="time">1 hour ago</div>
               </div>
@@ -94,7 +94,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Block not properly wrought</div>
                 <div class="time">2 hour ago</div>
               </div>

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

@@ -376,7 +376,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -384,7 +384,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service!</div>
                 <div class="time">43 minutes ago</div>
               </div>
@@ -392,7 +392,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Print sheets strip off</div>
                 <div class="time">1 hour ago</div>
               </div>
@@ -400,7 +400,7 @@
               <div class="icon-holder">
                 <div class="priority icon"></div>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Block not properly wrought</div>
                 <div class="time">2 hour ago</div>
               </div>

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

@@ -78,7 +78,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -86,7 +86,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service here_with_some_extrem_example_sting_witch_can_really_be!</div>
                 <div class="time">43 minutes ago</div>
               </div>
@@ -94,7 +94,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Print sheets strip off</div>
                 <div class="time">1 hour ago</div>
               </div>
@@ -102,7 +102,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Block not properly wrought</div>
                 <div class="time">2 hour ago</div>
               </div>
@@ -116,7 +116,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -124,7 +124,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service!</div>
                 <div class="time">43 minutes ago</div>
               </div>

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

@@ -70,7 +70,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -78,7 +78,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service!</div>
                 <div class="time">43 minutes ago</div>
               </div>
@@ -86,7 +86,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Print sheets strip_off_with_a_lot_of_text_in_the_headline</div>
                 <div class="time">1 hour ago</div>
               </div>
@@ -94,7 +94,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Block not properly wrought</div>
                 <div class="time">2 hour ago</div>
               </div>
@@ -108,7 +108,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Micro-SIM doesn't work</div>
                 <div class="time">23 minutes ago</div>
               </div>
@@ -116,7 +116,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Superb Service!</div>
                 <div class="time">43 minutes ago</div>
               </div>
@@ -124,7 +124,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Print sheets strip off with a lot of text in the headline</div>
                 <div class="time">1 hour ago</div>
               </div>
@@ -132,7 +132,7 @@
               <div class="icon-holder">
                 <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
               </div>
-              <div class="flex">
+              <div class="task-text">
                 <div class="name">Block not properly wrought</div>
                 <div class="time">2 hour ago</div>
               </div>

+ 1 - 1
app/assets/javascripts/app/views/link/info.jst.eco

@@ -8,7 +8,7 @@
       <div class="icon-holder">
         <svg class="<%- item.icon() %>"><use xlink:href="#icon-priority" /></svg>
       </div>
-      <div class="flex">
+      <div class="task-text">
         <a class="name ticket-popover" data-id="<%- item.id %>" href="#ticket/zoom/<%= item.id %>"><%= item.title %></a>
         <div class="time humanTimeFromNow" data-time="<%- item.created_at %>"></div>
       </div>

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

@@ -7,7 +7,7 @@
     <div class="icon-holder">
       <svg class="<%- ticket.icon() %>"><use xlink:href="#icon-priority" /></svg>
     </div>
-    <div class="flex">
+    <div class="task-text">
       <a class="name ticket-popover" data-id="<%- ticket_id %>" href="<%- ticket.uiUrl() %>"><%= ticket.title %></a>
       <div class="time humanTimeFromNow" data-time="<%- ticket.created_at %>"></div>
     </div>

+ 9 - 2
app/assets/stylesheets/zammad.css.scss

@@ -1735,8 +1735,14 @@ footer {
       display: flex;
     }
 
+    .tasks--standalone .task-text {
+      flex: 1;
+      min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
+    }
+
     .tasks--standalone .name {
       @extend .u-highlight, .u-textTruncate;
+      display: block;
     }
 
     .tasks--standalone .time {
@@ -2746,7 +2752,7 @@ footer {
     position: relative;
     display: flex;
     flex: 1;
-    min-width: 0; /* Firefox workaround */
+    min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
   }
 
   .activity-entry:not(:last-child) .activity-body:after {
@@ -2769,7 +2775,7 @@ footer {
 
   .activity-message {
     flex: 1;
-    min-width: 0; /* Firefox workaround */
+    min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
   }
 
   .activity-time {
@@ -5067,6 +5073,7 @@ label + .wizard-buttonList {
   flex-direction: column;
   flex: 1 1 50%;
   padding: 0 25px;
+  min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
 
   .tasks {
     margin-bottom: 10px;