diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-09-14 17:00:48 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-09-14 21:41:57 +0200 |
| commit | 7563abbe49fc16280877be89342d552e0609d57c (patch) | |
| tree | 167216095d19ce62484d80d89b718eac7be72b67 | |
| parent | e63d7b6029142d100adca03e11ba0e33d9c2981c (diff) | |
| download | gitlab-ce-7563abbe49fc16280877be89342d552e0609d57c.tar.gz | |
Add 'notes/reversed_notes_with_form' partial
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 14 | ||||
| -rw-r--r-- | app/views/notes/_reversed_notes_with_form.html.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/wall.html.haml | 2 |
3 files changed, 24 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 8db889307dd..2db20f166a6 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -10,7 +10,10 @@ padding:0px; } -#notes-list li:last-child { +#new-notes-list:not(.reversed) { + border-top:1px solid #aaa; +} +#new-notes-list.reversed { border-bottom:1px solid #aaa; } @@ -48,7 +51,6 @@ .note { padding: 8px 0; - border-bottom: 1px solid #eee; overflow: hidden; display: block; img {float: left; margin-right: 10px;} @@ -70,6 +72,14 @@ .delete-note { display:block; } } } +#notes-list:not(.reversed) .note, +#new-notes-list:not(.reversed) .note { + border-bottom: 1px solid #eee; +} +#notes-list.reversed .note, +#new-notes-list.reversed .note { + border-top: 1px solid #eee; +} .notes-status { margin: 18px; diff --git a/app/views/notes/_reversed_notes_with_form.html.haml b/app/views/notes/_reversed_notes_with_form.html.haml new file mode 100644 index 00000000000..05f01847da4 --- /dev/null +++ b/app/views/notes/_reversed_notes_with_form.html.haml @@ -0,0 +1,11 @@ +- if can? current_user, :write_note, @project + = render "notes/common_form" + +%ul.reversed#new-notes-list +%ul.reversed#notes-list +.notes-status + +:javascript + $(function(){ + NoteList.init("#{tid}", "#{tt}", "#{project_notes_path(@project)}"); + });
\ No newline at end of file diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml index 1a07bc3d392..591a8cd06d4 100644 --- a/app/views/projects/wall.html.haml +++ b/app/views/projects/wall.html.haml @@ -1,2 +1,2 @@ %div.wall_page - = render "notes/notes_with_form", tid: nil, tt: "wall" + = render "notes/reversed_notes_with_form", tid: nil, tt: "wall" |