deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed line ending issues on windows.

Browse source
This commit is contained in:
Steven Verbeek 2012-03-24 14:36:14 -03:00
parent 27244e0c9e
commit a805d3131f
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/Thumbs.db Normal file
View file

Binary file not shown.

BIN
app/assets/images/icon-attachment.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 406 B

1
app/assets/javascripts/note.js
View file

@ -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);
});

14
app/assets/stylesheets/common.scss
View file

@ -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;
}
}
}

4
app/views/notes/_show.html.haml
View 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