aleph-engineering · yoandyshyno · Apr 6, 2017 · Apr 7, 2017 · Apr 7, 2017 · Apr 7, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .idea
-.tasks/server.log
-.tasks/server.pid
+.tasks/*
+!.tasks/data
 node_modules
 tmp
diff --git a/.tasks/.npmignore b/.tasks/.npmignore
diff --git a/.tasks/LICENSE b/.tasks/LICENSE
diff --git a/.tasks/README.md b/.tasks/README.md
diff --git a/.tasks/common.js b/.tasks/common.js
diff --git a/.tasks/config.js b/.tasks/config.js
diff --git a/.tasks/data/f3ce32385cf142bd1cc4b0eb1ec8b6293337b3ad8be9bdf4dc84dfe316ec37fa b/.tasks/data/f3ce32385cf142bd1cc4b0eb1ec8b6293337b3ad8be9bdf4dc84dfe316ec37fa
@@ -0,0 +1,15 @@
+{
+  "status": "done",
+  "pending": 0,
+  "estimation": "2",
+  "title": "Styling Dashboard",
+  "description": "adding some styles to dashboard.",
+  "tags": "webpage",
+  "gitStatus": "A ",
+  "assignedTo": "yoandyshyno",
+  "priority": "5",
+  "actualTime": "1",
+  "id": "f3ce32385cf142bd1cc4b0eb1ec8b6293337b3ad8be9bdf4dc84dfe316ec37fa",
+  "createdAt": 1491567535915,
+  "updatedAt": 1491567716872
+}
diff --git a/.tasks/jquery.js b/.tasks/jquery.js
diff --git a/.tasks/marked.min.js b/.tasks/marked.min.js
diff --git a/.tasks/styles.css b/.tasks/styles.css
diff --git a/.tasks/tasks.html b/.tasks/tasks.html
diff --git a/.tasks/tasks_dashboard.js b/.tasks/tasks_dashboard.js
diff --git a/site/font-awesome.min.css b/site/font-awesome.min.css
diff --git a/site/fonts/FontAwesome.otf b/site/fonts/FontAwesome.otf
diff --git a/site/fonts/fontawesome-webfont.eot b/site/fonts/fontawesome-webfont.eot
diff --git a/site/fonts/fontawesome-webfont.svg b/site/fonts/fontawesome-webfont.svg
diff --git a/site/fonts/fontawesome-webfont.ttf b/site/fonts/fontawesome-webfont.ttf
diff --git a/site/fonts/fontawesome-webfont.woff b/site/fonts/fontawesome-webfont.woff
diff --git a/site/fonts/fontawesome-webfont.woff2 b/site/fonts/fontawesome-webfont.woff2
diff --git a/site/styles.css b/site/styles.css
@@ -54,10 +54,13 @@ a {
 .task_item {
     width: 160px;
     min-height: 100px;
-    border: 0 solid black;
+    border: 2px solid black;
+    border-radius: 5px;
+    cursor: grabbing;
+    cursor: -webkit-grabbing;
     background-color: #b8fffa;
     margin: 3px;
-    padding: 2px;
+    padding: 4px;
     float: left;
     overflow: auto;
 }
@@ -143,10 +146,10 @@ a {
 .main_menu {
     padding: 5px;
     width: 98%;
-    position: fixed;
     background-color: white;
     border: 1px solid black;
     vertical-align: middle;
+    height: 50px;
 }
 
 .main_menu_top_section {
@@ -155,11 +158,12 @@ a {
 }
 
 .main_menu_space {
-    height: 40px;
+    height: 2px;
 }
 
 .menu_section {
     float: left;
+    line-height: 25px;
 }
 
 .menu_right_section {
@@ -218,3 +222,18 @@ a {
     margin-top: 5px;
     margin-bottom: 5px;
 }
+
+.btn {
+  -webkit-border-radius: 5;
+  -moz-border-radius: 5;
+  border-radius: 5px;
+  color: #ffffff;
+  background: #3498db;
+  padding: 5px 8px 5px 8px;
+  text-decoration: none;
+}
+
+.btn:hover {
+  background: #3cb0fd;
+  text-decoration: none;
+}
diff --git a/site/tasks.html b/site/tasks.html
@@ -9,20 +9,21 @@
     <script src="common.js" type="text/javascript"></script>
     <script src="tasks_dashboard.js" type="text/javascript" async></script>
     <link rel="stylesheet" href="styles.css">
+    <link rel="stylesheet" href="font-awesome.min.css">
 </head>
 <body>
     <div class="main_menu">
         <div class="main_menu_top_section">
             <div class="menu_section">
                 <span id="branch_name"></span> branch |
-                <a id="new_task_button" href="#">New task</a> |
-                <a id="commit_button" href="#">Commit</a>
+                <a id="new_task_button" class="btn" href="#" class="btn">New task</a> |
+                <a id="commit_button" href="#" class="btn">Commit</a>
                 <br />
                 <span id="hour_count"></span>
                  | Timer -
                 <span id="timer_display">00:00:00</span>
-                <a id="timer_start_button" href="#">Start</a> /
-                <a id="timer_reset_button" href="#">Reset</a>
+                <a id="timer_start_button" href="#" class="btn">Start</a> /
+                <a id="timer_reset_button" href="#" class="btn">Reset</a>
             </div>
             <div class="menu_right_section">
                 <input id="reverse_sort_checkbox" type="checkbox" />

diff --git a/site/tasks_dashboard.js b/site/tasks_dashboard.js
@@ -228,8 +228,8 @@ function addTask(task, prevItem) {
             '<span class="task_item_estimation">%estimation%</span>h<br/>' +
             '<span class="task_item_tags">%tags%</span>' +
             '<div class="task_options">' +
-                '<a class="edit_task_link" href="#">E</a> ' +
-                '<a class="task_menu_link" href="#">M</a>' +
+                '<a class="edit_task_link" href="#"><i class="fa fa-edit"></i></a> ' +
+                '<a class="task_menu_link" href="#"><i class="fa fa-bars"></i></a>' +
             '</div>' +
         '</div>';
     var tags = (!task.tags || task.tags.isWhitespace()) ?
@@ -752,7 +752,8 @@ function registerTaskMenuHideEvent() {
         var taskMenu = $("#task_menu");
         if (target.attr("id") != "task_menu" &&
             !target.hasClass("task_menu_link") &&
-            !taskMenu.hasClass("hidden")) {
+            !taskMenu.hasClass("hidden") &&
+            !target.hasClass("fa-bars")) {
             taskMenu.addClass("hidden");
         }
     });