Download as
Browse Code »

Commit a805d3131f7321e6f24a1f986ef1e7704ef9a734

Authored by Steven Verbeek
1 parent 27244e0c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed line ending issues on windows.

Showing 5 changed files with 16 additions and 3 deletions   Show diff stats
app/assets/images/Thumbs.db 0 → 100644
View file @a805d31
No preview for this file type
app/assets/images/icon-attachment.png 0 → 100644
View file @a805d31

406 Bytes
app/assets/javascripts/note.js
  Diff comments   View file @a805d31
... ... @@ -40,7 +40,6 @@ init:
40 40 $("#note_attachment").change(function(e){
41 41 var val = $('.input-file').val();
42 42 var filename = val.replace(/^.*[\\\/]/, '');
43   - console.log(filename,val);
44 43 $(".file_name").text(filename);
45 44 });
46 45  
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @a805d31
... ... @@ -1117,6 +1117,20 @@ p.time {
1117 1117 .file_name {
1118 1118 line-height:30px;
1119 1119 width:240px;
  1120 + height:28px;
1120 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 1137 \ No newline at end of file
... ...
app/views/notes/_show.html.haml
  Diff comments   View file @a805d31
... ... @@ -12,6 +12,6 @@
12 12 = markdown(note.note)
13 13 - if note.attachment.url
14 14 .right
15   - %span.file
16   - = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
  15 + %div.file
  16 + = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
17 17 .clear
... ...