BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
46605c91
Commit
46605c91
authored
Mar 24, 2012
by
Steven Verbeek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Started note attachment changes, and text changes
parent
6c40e898
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
3 deletions
+47
-3
note.js
app/assets/javascripts/note.js
+4
-0
common.scss
app/assets/stylesheets/common.scss
+38
-0
_form.html.haml
app/views/notes/_form.html.haml
+5
-3
No files found.
app/assets/javascripts/note.js
View file @
46605c91
...
...
@@ -37,6 +37,10 @@ init:
$
(
'.attach_holder'
).
show
();
});
$
(
"#note_attachment"
).
change
(
function
(
e
){
alert
(
$
(
'input[type=file]'
).
val
());
});
},
...
...
app/assets/stylesheets/common.scss
View file @
46605c91
...
...
@@ -1079,3 +1079,40 @@ p.time {
border-bottom
:
2px
solid
$style_color
;
}
}
// Fixes alignment on notes.
.new_note
{
label
{
text-align
:left
;
}
}
.issue_notes
{
.input-file
{
font
:
500px
monospace
;
opacity
:
0
;
filter
:
alpha
(
opacity
=
0
);
position
:
absolute
;
z-index
:
1
;
top
:
0
;
right
:
0
;
padding
:
0
;
margin
:
0
;
}
.file_upload
{
position
:
absolute
;
width
:
100%
;
height
:
100%
;
background
:url
(
'http://viget.com/uploads/image/custom-file-input.png'
)
;
border
:
0
;
text-indent
:
-9999px
;
}
div
.attachments
{
position
:relative
;
width
:
100px
;
height
:
30px
;
overflow
:hidden
;
}
}
\ No newline at end of file
app/views/notes/_form.html.haml
View file @
46605c91
...
...
@@ -24,8 +24,10 @@
.span4
%h5
Attachment:
.clearfix
=
f
.
label
:attachment
,
"Any file, < 10 MB"
.input
=
f
.
file_field
:attachment
,
:class
=>
"input-file"
=
f
.
label
:attachment
,
"Any file less then 10 MB"
.attachments
%button
.file_upload
.input
=
f
.
file_field
:attachment
,
:class
=>
"input-file"
=
f
.
submit
'Add
note
'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
f
.
submit
'Add
Comment
'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
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