summaryrefslogtreecommitdiff
path: root/assets/css
diff options
context:
space:
mode:
Diffstat (limited to 'assets/css')
-rw-r--r--assets/css/app.css12
-rw-r--r--assets/css/src/form.css2
-rw-r--r--assets/css/src/task.css4
-rw-r--r--assets/css/src/tooltip.css3
4 files changed, 21 insertions, 0 deletions
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;