Fixed line ending issues on windows.
This commit is contained in:
parent
27244e0c9e
commit
a805d3131f
5 changed files with 16 additions and 3 deletions
BIN
app/assets/images/Thumbs.db
Normal file
BIN
app/assets/images/Thumbs.db
Normal file
Binary file not shown.
BIN
app/assets/images/icon-attachment.png
Normal file
BIN
app/assets/images/icon-attachment.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 406 B |
|
@ -40,7 +40,6 @@ init:
|
||||||
$("#note_attachment").change(function(e){
|
$("#note_attachment").change(function(e){
|
||||||
var val = $('.input-file').val();
|
var val = $('.input-file').val();
|
||||||
var filename = val.replace(/^.*[\\\/]/, '');
|
var filename = val.replace(/^.*[\\\/]/, '');
|
||||||
console.log(filename,val);
|
|
||||||
$(".file_name").text(filename);
|
$(".file_name").text(filename);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1117,6 +1117,20 @@ p.time {
|
||||||
.file_name {
|
.file_name {
|
||||||
line-height:30px;
|
line-height:30px;
|
||||||
width:240px;
|
width:240px;
|
||||||
|
height:28px;
|
||||||
overflow:hidden;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -12,6 +12,6 @@
|
||||||
= markdown(note.note)
|
= markdown(note.note)
|
||||||
- if note.attachment.url
|
- if note.attachment.url
|
||||||
.right
|
.right
|
||||||
%span.file
|
%div.file
|
||||||
= link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
|
= link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
|
||||||
.clear
|
.clear
|
||||||
|
|
Loading…
Reference in a new issue