Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

4 files changed, 21 insertions, 12 deletions

diff --git a/assets/css/src/base.css b/assets/css/src/base.css
index 3b231d07..6576d3cc 100644
--- a/assets/css/src/base.css
+++ b/assets/css/src/base.css
@@ -52,3 +52,8 @@ hr {
     float: left;
     margin-right: 10px;
 }
+
+/* datepicker */
+#ui-datepicker-div {
+    font-size: 0.8em;
+}
diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index 1c1b8ed2..ef12404c 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -137,6 +137,7 @@ ul.form-errors li {
     display: inline;
 }
 
+input.form-datetime,
 input.form-date {
     width: 150px;
 }
diff --git a/assets/css/src/pagination.css b/assets/css/src/pagination.css
index 6809bc22..79952874 100644
--- a/assets/css/src/pagination.css
+++ b/assets/css/src/pagination.css
@@ -1,8 +1,3 @@
-/* datepicker */
-#ui-datepicker-div {
-    font-size: 0.8em;
-}
-
 /* pagination */
 .pagination {
     text-align: center;
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 1b35c995..cbc35bb8 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -1,10 +1,10 @@
 /* task inside the board */
 .task-board {
     position: relative;
-    margin-bottom: 5px;
+    margin-bottom: 2px;
     border: 1px solid #000;
-    padding: 3px;
-    font-size: 0.9em;
+    padding: 2px;
+    font-size: 0.85em;
     word-wrap: break-word;
 }
 
@@ -44,11 +44,12 @@ a.task-board-collapsed-title {
 .task-board .dropdown {
     float: left;
     margin-right: 5px;
+    font-size: 1.1em;
 }
 
 .task-board-title {
-    margin-top: 10px;
-    margin-bottom: 10px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     font-size: 1.1em;
 }
 
@@ -77,8 +78,6 @@ a.task-board-nobody {
 
 .task-board-category-container {
     text-align: right;
-    padding-bottom: 2px;
-    margin-top: 10px;
 }
 
 .task-board-category {
@@ -289,3 +288,12 @@ span.task-board-date-overdue {
 .task-show-file-table {
     width: auto;
 }
+
+.task-show-start-link {
+    color: #000;
+}
+
+.task-show-start-link:hover,
+.task-show-start-link:focus {
+    color: red;
+}