consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve conflicts. Refactor documentable and imageable styles.

Browse Source
This commit is contained in:
Alessandro Cuoghi
2017-09-21 15:36:40 +02:00
committed by Senén Rodero Rodríguez
parent 95016a1bf3
commit 3745e76c07
13 changed files with 133 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/documentable.js.coffee
View File

@@ -37,6 +37,7 @@ App.Documentable =
App.Documentable.clearInputErrors(data)
App.Documentable.setInputErrors(data)
$(data.destroyAttachmentLinkContainer).find("a.delete:not(.remove-nested)").remove()
$(data.addAttachmentLabel).addClass('error')
$(data.addAttachmentLabel).show()
done: (e, data) ->
@@ -46,6 +47,8 @@ App.Documentable =
App.Documentable.setFilename(data, data.result.filename)
App.Documentable.clearInputErrors(data)
$(data.addAttachmentLabel).hide()
$(data.wrapper).find(".attachment-actions").removeClass('small-12').addClass('small-6 float-right')
$(data.wrapper).find(".attachment-actions .action-remove").removeClass('small-3').addClass('small-12')
destroyAttachmentLink = $(data.result.destroy_link)
$(data.destroyAttachmentLinkContainer).html(destroyAttachmentLink)