diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db new file mode 100644 index 00000000..a0bc9eae Binary files /dev/null and b/app/assets/images/Thumbs.db differ diff --git a/app/assets/images/icon-attachment.png b/app/assets/images/icon-attachment.png new file mode 100644 index 00000000..ded6d145 Binary files /dev/null and b/app/assets/images/icon-attachment.png differ diff --git a/app/assets/javascripts/note.js b/app/assets/javascripts/note.js index 12f904ae..c45cdd90 100644 --- a/app/assets/javascripts/note.js +++ b/app/assets/javascripts/note.js @@ -40,7 +40,6 @@ init: $("#note_attachment").change(function(e){ var val = $('.input-file').val(); var filename = val.replace(/^.*[\\\/]/, ''); - console.log(filename,val); $(".file_name").text(filename); }); diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 009790e5..77ff641f 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1117,6 +1117,20 @@ p.time { .file_name { line-height:30px; width:240px; + height:28px; overflow:hidden; } +} + +// Fix issue with notes & lists creating a bunch of bottom borders. +li.note { + .note-title { + li { + border-bottom:none !important; + } + .file { + padding-left:20px; + background:url("icon-attachment.png") no-repeat left center; + } + } } \ No newline at end of file diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml index 6da1d590..916fda06 100644 --- a/app/views/notes/_show.html.haml +++ b/app/views/notes/_show.html.haml @@ -12,6 +12,6 @@ = markdown(note.note) - if note.attachment.url .right - %span.file - = link_to note.attachment_identifier, note.attachment.url, :target => "_blank" + %div.file + = link_to note.attachment_identifier, note.attachment.url, :target => "_blank" .clear