Browse Source

Merge branch 'pravdomil-patch-3' into devel

Lauri Ojansivu 7 năm trước cách đây
mục cha
commit
03921a969a

+ 7 - 2
CHANGELOG.md

@@ -1,11 +1,16 @@
 # Upcoming Wekan release
 # 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 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).
 * [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
 # v1.07 2018-06-14 Wekan release
 
 

+ 2 - 2
client/components/cards/minicard.styl

@@ -5,7 +5,7 @@
   position: relative
   position: relative
   display: flex
   display: flex
   align-items: center
   align-items: center
-  margin-bottom: 9px
+  margin-bottom: 2px
 
 
   &.placeholder
   &.placeholder
     background: darken(white, 20%)
     background: darken(white, 20%)
@@ -37,7 +37,7 @@
   flex-wrap: wrap
   flex-wrap: wrap
   background-color: #fff
   background-color: #fff
   min-height: 20px
   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
   border-radius: 2px
   color: #4d4d4d
   color: #4d4d4d
   overflow: hidden
   overflow: hidden