From c5fce2efcd708108258ca52d17702f989780c5e4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 3 Oct 2017 09:37:19 +0300
Subject: [PATCH] Working on the time tracker

---
 resources/views/list.blade.php               | 2 +-
 resources/views/tasks/time_tracker.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index e2219763b1f0..6fc863e2b2e2 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -87,6 +87,7 @@
 			});
 		</script>
 	@elseif ($entityType == ENTITY_TASK)
+		{!! Button::normal(trans('texts.time_tracker'))->asLinkTo('javascript:openTimeTracker()')->appendIcon(Icon::create('time')) !!}
 		{!! DropdownButton::normal(trans('texts.projects'))
 			->withAttributes(['class'=>'projectsDropdown'])
 			->withContents([
@@ -100,7 +101,6 @@
 		  		});
 			});
 		</script>
-		{!! Button::normal(trans('texts.time_tracker'))->asLinkTo('javascript:openTimeTracker()')->appendIcon(Icon::create('time')) !!}
     @endif
 
 	@if (Auth::user()->can('create', $entityType) && empty($vendorId))
diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 920ea29578a8..142cd1f1a3d8 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -196,7 +196,7 @@
         <div class="row no-gutter">
 
             <!-- Task Form -->
-            <div id="taskForm" class="col-sm-7 col-sm-push-5">
+            <div id="taskForm" class="col-sm-8 col-sm-push-4 col-md-7 col-md-push-5">
                 <div id="formDiv" class="panel panel-default x-affix" data-bind="visible: selectedTask" style="margin:20px; display:none;">
                     <div class="panel-body">
 						<form id="taskForm">
@@ -304,7 +304,7 @@
             </div>
 
             <!-- Task List -->
-            <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none;overflow:auto;margin-bottom:0px;">
+            <div id="taskList" class="list-group col-sm-4 col-sm-pull-8 col-md-5 col-md-pull-7" style="display:none;overflow:auto;margin-bottom:0px;">
 				<div id="filterPanel" style="margin-bottom:0px;padding-top:20px;padding-bottom:0px;padding-left:10px;display:none;">
 					<div class="panel panel-default">
 						<div class="panel-body">