From 364382b1b58db8bf1bd2c8866e21c869a7a5d6d0 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 13 Feb 2015 17:50:20 -0500
Subject: Add task links (Merge pull-request #610)

---
 assets/css/app.css         | 12 ++++++++++++
 assets/css/src/form.css    |  2 ++
 assets/css/src/task.css    |  4 ++++
 assets/css/src/tooltip.css |  3 +++
 4 files changed, 21 insertions(+)

(limited to 'assets/css')

diff --git a/assets/css/app.css b/assets/css/app.css
index 8ad66d15..42c0ff64 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -901,6 +901,8 @@ textarea {
 
 select {
     max-width: 95%;
+    paddin-top: 5px;
+    paddin-bottom: 5px;
 }
 
 ::-webkit-input-placeholder {
@@ -1267,6 +1269,9 @@ div.ui-tooltip {
     width: 550px;
 }
 
+.tooltip-tasklinks ul{
+    padding-left: 13px;
+}
 .column-tooltip {
 	color: #999;
 	font-size: 0.95em;
@@ -1632,6 +1637,7 @@ a.task-board-nobody {
     padding: 3px;
 }
 
+<<<<<<< HEAD
 .task-days-age {
     font-size: 0.8em;
     border: #888 1px solid;
@@ -1651,6 +1657,12 @@ a.task-board-nobody {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
 }
+=======
+.task-closed {
+    text-decoration: line-through;
+}
+
+>>>>>>> 3ba416a8c3c0cbf9119f97de86eb447dbf8a18db
 /* comments */
 .comment {
     margin-bottom: 20px;
diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index 60dccd4c..059cb49a 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -55,6 +55,8 @@ textarea {
 
 select {
     max-width: 95%;
+    paddin-top: 5px;
+    paddin-bottom: 5px;
 }
 
 ::-webkit-input-placeholder {
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 11414364..9cd6f241 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -225,3 +225,7 @@ a.task-board-nobody {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
 }
+
+.task-closed {
+    text-decoration: line-through;
+}
diff --git a/assets/css/src/tooltip.css b/assets/css/src/tooltip.css
index a940bc16..2c6070e4 100644
--- a/assets/css/src/tooltip.css
+++ b/assets/css/src/tooltip.css
@@ -64,6 +64,9 @@ div.ui-tooltip {
     width: 550px;
 }
 
+.tooltip-tasklinks ul{
+    padding-left: 13px;
+}
 .column-tooltip {
 	color: #999;
 	font-size: 0.95em;
-- 
cgit v1.2.3