diff options
author | Maxime Quandalle <mquandalle@wekan.io> | 2016-07-19 02:18:44 +0200 |
---|---|---|
committer | Maxime Quandalle <mquandalle@wekan.io> | 2016-07-19 02:18:44 +0200 |
commit | b96a60c9bbaa8bf20ca2b00872e7639058e6aaa5 (patch) | |
tree | 8958627e471d55b1258467c27bd77c835efa53bc /client | |
parent | 43f3a2f3d50c60663ced015ba838b3e71e98910d (diff) | |
parent | ecf050ba546bc32a0941bbbf61c4a0a4bcf8fb24 (diff) | |
download | wekan-b96a60c9bbaa8bf20ca2b00872e7639058e6aaa5.tar.gz wekan-b96a60c9bbaa8bf20ca2b00872e7639058e6aaa5.tar.bz2 wekan-b96a60c9bbaa8bf20ca2b00872e7639058e6aaa5.zip |
Merge PR #593 into devel
Diffstat (limited to 'client')
-rw-r--r-- | client/components/cards/attachments.jade | 3 | ||||
-rw-r--r-- | client/components/cards/attachments.styl | 10 | ||||
-rw-r--r-- | client/components/cards/minicard.jade | 3 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 7 |
4 files changed, 11 insertions, 12 deletions
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index 2cb3bb85..da728114 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -49,4 +49,5 @@ template(name="attachmentsGalery") | {{_ 'delete'}} if currentUser.isBoardMember - a.attachment-item.add-attachment.js-add-attachment {{_ 'add-attachment' }} + li.attachment-item.add-attachment + a.js-add-attachment {{_ 'add-attachment' }} diff --git a/client/components/cards/attachments.styl b/client/components/cards/attachments.styl index f322ebc8..9a5d0645 100644 --- a/client/components/cards/attachments.styl +++ b/client/components/cards/attachments.styl @@ -20,6 +20,10 @@ display: flex align-items: center + a + display: block + margin: auto + .attachment-thumbnail height: 80px display: flex @@ -28,8 +32,8 @@ position: relative .attachment-thumbnail-img - height: 100% - width: 100% + max-height: 100% + max-width: 100% .attachment-thumbnail-ext text-transform: uppercase @@ -39,7 +43,7 @@ font-size: 0.75em margin: 3px - .attachment-details-actions + .attachment-details-actions a display: block .attachment-image-preview diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 573b3da1..1dfd2f8e 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -1,8 +1,7 @@ template(name="minicard") .minicard if cover - .minicard-cover - img(src="{{pathFor cover.url}}") + .minicard-cover(style="background-image: url('{{pathFor cover.url}}');") if labels .minicard-labels each labels diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 3b8c8a9a..0f6f8ad2 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -62,16 +62,11 @@ .minicard-cover background-position: center background-repeat: no-repeat - background-size: cover + background-size: contain height: 145px user-select: none margin: -6px -8px 6px -8px border-radius: top 2px - position: relative - - img - height: 100% - width: 100% .minicard-labels float: right |