summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-06-26 01:08:18 +0300
committerLauri Ojansivu <x@xet7.org>2018-06-26 01:08:18 +0300
commit03921a969a27925712ba0a7746e9dcf19028c968 (patch)
treebcb844c38741a5bff5dc4b6a157aa520caefa70c
parent2efc5ab4e9244e0073b3404c312b868a846db77d (diff)
parentb7d51456eb859cbdf5fbd627796d2c5038ad26d8 (diff)
downloadwekan-03921a969a27925712ba0a7746e9dcf19028c968.tar.gz
wekan-03921a969a27925712ba0a7746e9dcf19028c968.tar.bz2
wekan-03921a969a27925712ba0a7746e9dcf19028c968.zip
Merge branch 'pravdomil-patch-3' into devel
-rw-r--r--CHANGELOG.md9
-rw-r--r--client/components/cards/minicard.styl4
2 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358763c3..a801988c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,16 @@
# Upcoming Wekan release
-This release fixes the following bugs:
+This release adds the following new features:
+
+* [Add more card inner shadow](https://github.com/wekan/wekan/commit/6a587299b80a49fce0789628ff65885b5ed2c837);
+* [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713);
+
+and fixes the following bugs:
* [Fix typo in English translation](https://github.com/wekan/wekan/pull/1710);
* [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714).
-Thanks to GitHub users pravdomil and zypA13510 for their contributions.
+Thanks to GitHub users pravdomil, xet7 and zypA13510 for their contributions.
# v1.07 2018-06-14 Wekan release
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index 38f829d0..391a6316 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -5,7 +5,7 @@
position: relative
display: flex
align-items: center
- margin-bottom: 9px
+ margin-bottom: 2px
&.placeholder
background: darken(white, 20%)
@@ -37,7 +37,7 @@
flex-wrap: wrap
background-color: #fff
min-height: 20px
- box-shadow: 0 1px 2px rgba(0,0,0,.15)
+ box-shadow: 0 0px 16px rgba(0,0,0,0.15) inset
border-radius: 2px
color: #4d4d4d
overflow: hidden