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
iv
gitlab-ce
Commits
8e0b58d7
Commit
8e0b58d7
authored
Feb 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
render note with attachment for event
parent
ab191963
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+9
-0
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-0
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+7
-0
No files found.
app/assets/stylesheets/sections/events.scss
View file @
8e0b58d7
...
@@ -52,6 +52,15 @@
...
@@ -52,6 +52,15 @@
padding-left
:
5px
;
padding-left
:
5px
;
display
:
inline-block
;
display
:
inline-block
;
color
:
#555
;
color
:
#555
;
.note-file-attach
{
margin-left
:
-25px
;
float
:
left
;
.note-image-attach
{
margin-left
:
0px
;
max-width
:
200px
;
}
}
}
}
.event-note-icon
{
.event-note-icon
{
color
:
#777
;
color
:
#777
;
...
...
app/assets/stylesheets/sections/notes.scss
View file @
8e0b58d7
...
@@ -273,6 +273,7 @@ ul.notes {
...
@@ -273,6 +273,7 @@ ul.notes {
}
}
.note-form-actions
{
.note-form-actions
{
background
:
#F9F9F9
;
background
:
#F9F9F9
;
height
:
45px
;
height
:
45px
;
...
...
app/views/events/event/_note.html.haml
View file @
8e0b58d7
...
@@ -24,3 +24,10 @@
...
@@ -24,3 +24,10 @@
%i
.icon-comment-alt.event-note-icon
%i
.icon-comment-alt.event-note-icon
%span
.event-note
%span
.event-note
=
markdown
truncate
(
event
.
target
.
note
,
length:
70
)
=
markdown
truncate
(
event
.
target
.
note
,
length:
70
)
-
note
=
event
.
target
=
link_to
note
.
attachment
.
url
,
target:
"_blank"
,
class:
'note-file-attach'
do
-
if
note
.
attachment
.
image?
=
image_tag
note
.
attachment
.
url
,
class:
'note-image-attach'
-
else
%i
.icon-paper-clip
=
note
.
attachment_identifier
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