summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-05-02 17:18:22 +0300
committerLauri Ojansivu <x@xet7.org>2018-05-02 17:18:22 +0300
commit0aa78d984777e21f13feb9f73d920777fcffc8fb (patch)
treec39ea274b8cacd9ecd26c5f0987c9bb5c383f791
parent7b0cf760e9dd4ac15e3b1ca037c6a9786a062416 (diff)
parente5c1351e82500ce490fcb92545ba87a23f0c53a6 (diff)
downloadwekan-0aa78d984777e21f13feb9f73d920777fcffc8fb.tar.gz
wekan-0aa78d984777e21f13feb9f73d920777fcffc8fb.tar.bz2
wekan-0aa78d984777e21f13feb9f73d920777fcffc8fb.zip
Merge branch 'lichtamberg-devel' into devel
-rw-r--r--CHANGELOG.md9
-rw-r--r--client/components/cards/checklists.styl9
2 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32dd5d4..a2771a48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+* [Checklist items lineheight to 18px, and positioning
+ improvements](https://github.com/wekan/wekan/issues/1619).
+
+Thanks to GitHub user lichtamberg for contributions.
+
# v0.92 2018-05-01 Wekan release
This release tries to fix the following bugs, please test:
diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl
index e9a6d807..d48c1851 100644
--- a/client/components/cards/checklists.styl
+++ b/client/components/cards/checklists.styl
@@ -94,7 +94,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
.checklist-item
margin: 0 0 0 0.1em
- line-height: 14px
+ line-height: 18px
font-size: 1.1em
margin-top: 3px
display: flex
@@ -114,7 +114,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
background-color: darken(white, 8%)
.check-box
- margin-top: 0px
+ margin: 0.1em 0 0 0;
&.is-checked
border-bottom: 2px solid #3cb500
border-right: 2px solid #3cb500
@@ -125,6 +125,9 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
&.is-checked
color: #8c8c8c
font-style: italic
+ & .viewer
+ p
+ margin-bottom: 2px
.js-delete-checklist-item
margin: 0 0 0.5em 1.33em
@@ -132,5 +135,5 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
padding: 12px 0 0 0
.add-checklist-item
- margin: 0 0 0.5em 1.33em
+ margin: 0.2em 0 0.5em 1.33em
display: inline-block