Fixed line ending issues on windows.

Steven Verbeek
1 parent 27244e0c
Showing 5 changed files with 16 additions and 3 deletions Show diff stats
app/assets/images/Thumbs.db
app/assets/images/icon-attachment.png
app/assets/javascripts/note.js
app/assets/stylesheets/common.scss
app/views/notes/_show.html.haml
@@ -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);
     });
@@ -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
@@ -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
	@@ -40,7 +40,6 @@ init:		@@ -40,7 +40,6 @@ init:
40	$("#note_attachment").change(function(e){	40	$("#note_attachment").change(function(e){
41	var val = $('.input-file').val();	41	var val = $('.input-file').val();
42	var filename = val.replace(/^.*[\\\/]/, '');	42	var filename = val.replace(/^.*[\\\/]/, '');
43	- console.log(filename,val);
44	$(".file_name").text(filename);	43	$(".file_name").text(filename);
45	});	44	});
46		45
	@@ -1117,6 +1117,20 @@ p.time {		@@ -1117,6 +1117,20 @@ p.time {
1117	.file_name {	1117	.file_name {
1118	line-height:30px;	1118	line-height:30px;
1119	width:240px;	1119	width:240px;
		1120	+ height:28px;
1120	overflow:hidden;	1121	overflow:hidden;
1121	}	1122	}
		1123	+}
		1124	+
		1125	+// Fix issue with notes & lists creating a bunch of bottom borders.
		1126	+li.note {
		1127	+ .note-title {
		1128	+ li {
		1129	+ border-bottom:none !important;
		1130	+ }
		1131	+ .file {
		1132	+ padding-left:20px;
		1133	+ background:url("icon-attachment.png") no-repeat left center;
		1134	+ }
		1135	+ }
1122	}	1136	}
1123	\ No newline at end of file	1137	\ No newline at end of file