summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-10-31 06:02:55 +0200
committerLauri Ojansivu <x@xet7.org>2017-10-31 06:02:55 +0200
commitc5e36d9160035c2f3640735620cf4157608b53c1 (patch)
treeced80a4671f652f766048fd57244463bb9862f25 /client
parentaa1646ad45de5877f193c6dd1734901827ef77d7 (diff)
parent28c78fdfef1a44622c411734b8a3f3fc2aff9dac (diff)
downloadwekan-c5e36d9160035c2f3640735620cf4157608b53c1.tar.gz
wekan-c5e36d9160035c2f3640735620cf4157608b53c1.tar.bz2
wekan-c5e36d9160035c2f3640735620cf4157608b53c1.zip
Merge branch 'attachments-improvements' of https://github.com/brooksbecton/wekan into brooksbecton-attachments-improvements
Diffstat (limited to 'client')
-rw-r--r--client/components/cards/attachments.jade4
-rw-r--r--client/components/cards/attachments.js3
-rw-r--r--client/components/cards/attachments.styl21
3 files changed, 23 insertions, 5 deletions
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index e35b364a..c8442691 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -21,11 +21,11 @@ template(name="attachmentDeletePopup")
template(name="attachmentsGalery")
.attachments-galery
each attachments
- a.attachment-item.js-open-viewer(title="{{_ 'added'}} {{ moment uploadedAt }}")
+ a.attachment-item.swipebox(href="{{url}}" title="{{name}}")
.attachment-thumbnail
if isUploaded
if isImage
- img.attachment-thumbnail-img.js-preview-image(src="{{url}}")
+ img.attachment-thumbnail-img(src="{{url}}")
else
span.attachment-thumbnail-ext= extension
else
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index 95cb9f55..36e8a5ec 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -11,9 +11,6 @@ Template.attachmentsGalery.events({
'click .js-download'(event) {
event.stopPropagation();
},
- 'click .js-open-viewer'() {
- // XXX Not implemented!
- },
'click .js-add-cover'() {
Cards.findOne(this.cardId).setCover(this._id);
},
diff --git a/client/components/cards/attachments.styl b/client/components/cards/attachments.styl
index 9a5d0645..4a22fd8a 100644
--- a/client/components/cards/attachments.styl
+++ b/client/components/cards/attachments.styl
@@ -58,7 +58,28 @@
.preview-clipboard-image
width: 280px
+ max-width: 100%;
height: 200px
display: block
border: 1px solid black
box-shadow: 0 1px 2px rgba(0,0,0,.2)
+
+@media screen and (max-width: 800px)
+ .attachments-galery
+ flex-direction
+ row
+ .attachment-item
+ width: 50% - 2%
+
+ .attachment-thumbnail
+ height: 130px
+ .attachment-details
+ font-size: 1.1em
+
+@media screen and (max-width: 360px)
+ .attachments-galery
+ .attachment-item
+ width: 100%
+
+ .attachment-thumbnail
+ height: 200px