diff options
| -rw-r--r-- | css/style.css | 19 | ||||
| -rw-r--r-- | templates/part.taskbody.php | 12 |
2 files changed, 25 insertions, 6 deletions
diff --git a/css/style.css b/css/style.css index 2bbddf9b..87c873bf 100644 --- a/css/style.css +++ b/css/style.css @@ -112,7 +112,7 @@ #content .icon { background-image: url("../img/sprites.svg"); height: 20px; - width: 20px; + width: 18px; display: inline-block; cursor: pointer; vertical-align: middle; @@ -375,7 +375,7 @@ } #content li.task-item .task-body .icon.large, #content div.task-item .task-body .icon.large{ - height: 34px; + height: 24px; } #content li.task-item .task-body, #content div.task-item .task-body { @@ -1428,10 +1428,23 @@ li.ui-draggable-dragging .duedate { } div.percentdone { height: 3px; - margin-bottom: -3px; + border-radius: 2px 0px 0px 2px; + opacity: 0.75; +} +div.percentbar { + height: 3px; + position: relative; + top: 26px; + left: 42px; + margin-right: 103px; + margin-bottom: -5px; background-color: #CCC; border-radius: 2px 2px 2px 2px; } +.icon_margin { + top: 2px; + position: relative; +} #searchresults { padding-top: 0px !important; margin-top: 20px !important; diff --git a/templates/part.taskbody.php b/templates/part.taskbody.php index f37590ec..2bd616a6 100644 --- a/templates/part.taskbody.php +++ b/templates/part.taskbody.php @@ -2,16 +2,22 @@ type="task" taskID="{{ task.uri }}" ng-class="{active: route.taskID==task.uri, subtasks: hasSubtasks(task), completedsubtasks: hasCompletedSubtasks(task), subtaskshidden: task.hideSubtasks, attachment: task.note!=''}"> - <div class="percentdone" style="width:{{ task.complete }}%; background-color:{{ task.calendar.color }};"></div> + + <div class="percentbar" ng-if="task.complete > 0 "> + <div class="percentdone" style="width:{{ task.complete }}%; background-color:{{ task.calendar.color }};"></div> + </div> + <a class="task-checkbox handler" name="toggleCompleted" ng-click="toggleCompleted(task)"> <span class="icon task-checkbox" ng-class="{'task-checked': task.completed}"></span> </a> <a class="icon task-separator"></a> <a class="task-star handler" ng-click="toggleStarred(task)"> - <span class="icon large task-star faded" ng-class="{'high':task.priority>5,'medium':task.priority==5,'low':task.priority > 0 && task.priority < 5}"></span> + <span class="icon large task-star faded" ng-class="{'icon_margin':task.complete > 0, + 'high':task.priority > 5, 'medium':task.priority == 5, 'low':task.priority > 0 && task.priority < 5}"> + </span> </a> <a class="task-addsubtask handler add-subtask" ng-show="task.calendar.writable" ng-click="showSubtaskInput(task.uid)" oc-click-focus="{selector: '.add-subtask input', timeout: 0}"> - <span class="icon large addsubtask" title="<?php p($l->t('add a subtask to')); ?> {{ task.summary }}"></span> + <span ng-class="{'icon_margin' : task.complete > 0}" class="icon large addsubtask" title="<?php p($l->t('add a subtask to')); ?> {{ task.summary }}"></span> </a> <a class="handler" ng-click="toggleSubtasks(task)"> <span class="icon large subtasks"></span> |