From a805d3131f7321e6f24a1f986ef1e7704ef9a734 Mon Sep 17 00:00:00 2001
From: Steven Verbeek <dubcanada@gmail.com>
Date: Sat, 24 Mar 2012 14:36:14 -0300
Subject: [PATCH] Fixed line ending issues on windows.

---
 app/assets/images/Thumbs.db           | Bin 0 -> 88576 bytes
 app/assets/images/icon-attachment.png | Bin 0 -> 406 bytes
 app/assets/javascripts/note.js        |  1 -
 app/assets/stylesheets/common.scss    | 14 ++++++++++++++
 app/views/notes/_show.html.haml       |  4 ++--
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/images/Thumbs.db
 create mode 100644 app/assets/images/icon-attachment.png

diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db
new file mode 100644
index 0000000..a0bc9ea
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 0000000..ded6d14
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 12f904a..c45cdd9 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 009790e..77ff641 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 6da1d59..916fda0 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
--
libgit2 0.21.2