Merge lp://staging/~doctormo/inkscape-web/comment-boxes into lp://staging/~marenhachmann/inkscape-web/comments
Proposed by
Martin Owens
| Status: | Merged |
|---|---|
| Merged at revision: | 554 |
| Proposed branch: | lp://staging/~doctormo/inkscape-web/comment-boxes |
| Merge into: | lp://staging/~marenhachmann/inkscape-web/comments |
| Diff against target: |
1614 lines (+909/-392) (has conflicts) 20 files modified
static/css/comments.css (+3/-27) static/css/gallery.css (+127/-117) static/css/main.css (+15/-22) static/images/flags.svg (+0/-69) static/images/icons/download.svg (+116/-0) static/images/icons/flags.svg (+69/-0) static/images/icons/view.svg (+177/-0) static/images/icons/vote.svg (+266/-0) static/images/thumbs.svg (+0/-36) static/js/gallery.js (+2/-2) static/js/inkscape.js (+29/-15) templates/base.html (+1/-0) templates/comments/comment_area.html (+11/-0) templates/comments/form.html (+1/-1) templates/comments/new_form.html (+2/-2) templates/comments/single_comment.html (+9/-1) templates/resource/delete_button.html (+0/-17) templates/resource/edit.html (+17/-15) templates/resource/gallery.html (+3/-3) templates/resource/view.html (+61/-65) Text conflict in templates/comments/comment_area.html Text conflict in templates/comments/single_comment.html |
| To merge this branch: | bzr merge lp://staging/~doctormo/inkscape-web/comment-boxes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Hachmann | Approve | ||
|
Review via email:
|
|||
Description of the change
A new design to match the comments and resource item display.
To post a comment you must log in.
Revision history for this message
| Hachmann (marenhachmann) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank you very much, doctormo!