Adjust width of timetracking column. Make subtasks wrap not under icons

app/Template/subtask/menu.php

@@ -1,5 +1,5 @@
 <div class="dropdown">
-    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
+    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><div class="subtask-submenu"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></div></a>
     <ul>
         <li>
             <?= $this->modal->medium('edit', t('Edit'), 'SubtaskController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>

app/Template/subtask/table.php

@@ -5,26 +5,28 @@
     >
     <thead>
         <tr>
-            <th class="column-45"><?= t('Title') ?></th>
-            <th class="column-15"><?= t('Assignee') ?></th>
+            <th><?= t('Title') ?></th>
+            <th class="column-10"><?= t('Assignee') ?></th>
             <?= $this->hook->render('template:subtask:table:header:before-timetracking') ?>
-            <th><?= t('Time tracking') ?></th>
+            <th class="column-30"><?= t('Time tracking') ?></th>
         </tr>
     </thead>
     <tbody>
         <?php foreach ($subtasks as $subtask): ?>
         <tr data-subtask-id="<?= $subtask['id'] ?>">
             <td>
+              <div class="subtask-table-td">
                 <?php if ($editable): ?>
-                    <i class="fa fa-arrows-alt draggable-row-handle" title="<?= t('Change subtask position') ?>"></i>&nbsp;
-                    <?= $this->render('subtask/menu', array(
-                        'task' => $task,
-                        'subtask' => $subtask,
-                    )) ?>
+                      <i class="fa fa-arrows-alt draggable-row-handle" title="<?= t('Change subtask position') ?>"></i>&nbsp;
+                      <?= $this->render('subtask/menu', array(
+                          'task' => $task,
+                          'subtask' => $subtask,
+                      )) ?>
                     <?= $this->subtask->renderToggleStatus($task, $subtask, 'table') ?>
                 <?php else: ?>
                     <?= $this->subtask->renderTitle($subtask) ?>
                 <?php endif ?>
+              </div>
             </td>
             <td>
                 <?php if (! empty($subtask['username'])): ?>

app/Template/task_external_link/table.php

@@ -4,9 +4,9 @@
         <tr>
             <th class="column-15"><?= t('Type') ?></th>
             <th><?= t('Title') ?></th>
-            <th class="column-10"><?= t('Dependency') ?></th>
+            <th class="column-15"><?= t('Dependency') ?></th>
             <th class="column-15"><?= t('Creator') ?></th>
-            <th class="column-15"><?= t('Date') ?></th>
+            <th class="column-10"><?= t('Date') ?></th>
         </tr>
     </thead>
     <tbody>

app/Template/task_file/files.php

@@ -2,9 +2,9 @@
     <table class="table-striped table-scrolling">
         <tr>
             <th><?= t('Filename') ?></th>
-            <th><?= t('Creator') ?></th>
-            <th><?= t('Date') ?></th>
-            <th><?= t('Size') ?></th>
+            <th class="column-15"><?= t('Size') ?></th>
+            <th class="column-15"><?= t('Creator') ?></th>
+            <th class="column-10"><?= t('Date') ?></th>
         </tr>
         <?php foreach ($files as $file): ?>
             <tr>
@@ -34,15 +34,15 @@
                         </ul>
                     </div>
                 </td>
+                <td>
+                    <?= $this->text->bytes($file['size']) ?>
+                </td>
                 <td>
                     <?= $this->text->e($file['user_name'] ?: $file['username']) ?>
                 </td>
                 <td>
                     <?= $this->dt->date($file['date']) ?>
                 </td>
-                <td>
-                    <?= $this->text->bytes($file['size']) ?>
-                </td>
             </tr>
         <?php endforeach ?>
     </table>

app/Template/task_internal_link/table.php

@@ -5,13 +5,13 @@
         <?php foreach ($grouped_links as $link): ?>
             <?php if (! $hide_td): ?>
                 <tr>
-                    <th class="column-45">
+                    <th>
                         <?= t('This task') ?>
                         <em><?= t($label) ?></em>
                         <span class="task-links-task-count">(<?= count($grouped_links) ?>)</span>
                     </th>
-                    <th class="column-15"><?= t('Assignee') ?></th>
-                    <th><?= t('Time tracking') ?></th>
+                    <th class="column-10"><?= t('Assignee') ?></th>
+                    <th class="column-30"><?= t('Time tracking') ?></th>
                 </tr>
                 <?php $hide_td = true ?>
             <?php endif ?>

assets/css/src/subtasks.css

@@ -27,3 +27,18 @@
         border-left: none
     }
 }
+
+.subtasks-table .subtask-table-td {
+    display: flex;
+    white-space: normal;
+    min-width: 400px;
+}
+
+.subtasks-table .subtask-submenu {
+    display: flex
+}
+
+.js-subtask-toggle-status {
+    display: flex;
+    text-decoration: none
+}

assets/css/src/task_list.css

@@ -26,3 +26,7 @@
         display: none
     }
 }
+
+.subtask-time-tracking {
+    white-space: normal
+}