Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
a805d313
Commit
a805d313
authored
Mar 24, 2012
by
Steven Verbeek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed line ending issues on windows.
parent
27244e0c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
app/assets/images/Thumbs.db
app/assets/images/Thumbs.db
+0
-0
app/assets/images/icon-attachment.png
app/assets/images/icon-attachment.png
+0
-0
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+0
-1
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+14
-0
app/views/notes/_show.html.haml
app/views/notes/_show.html.haml
+2
-2
No files found.
app/assets/images/Thumbs.db
0 → 100644
View file @
a805d313
File added
app/assets/images/icon-attachment.png
0 → 100644
View file @
a805d313
406 Bytes
app/assets/javascripts/note.js
View file @
a805d313
...
@@ -40,7 +40,6 @@ init:
...
@@ -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
);
});
});
...
...
app/assets/stylesheets/common.scss
View file @
a805d313
...
@@ -1117,6 +1117,20 @@ p.time {
...
@@ -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
;
}
}
}
}
\ No newline at end of file
app/views/notes/_show.html.haml
View file @
a805d313
...
@@ -12,6 +12,6 @@
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment