mirror of
https://git.zx2c4.com/cgit
synced 2024-12-22 07:01:52 +00:00
Merge branch 'jw/commit-decorations'
Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
commit
dfc4c82aad
6
cgit.css
6
cgit.css
@ -500,6 +500,12 @@ a.deco {
|
||||
background-color: #ff8888;
|
||||
border: solid 1px #770000;
|
||||
}
|
||||
|
||||
div.commit-subject a {
|
||||
margin-left: 1em;
|
||||
font-size: 75%;
|
||||
}
|
||||
|
||||
table.stats {
|
||||
border: solid 1px black;
|
||||
border-collapse: collapse;
|
||||
|
@ -9,7 +9,7 @@ run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
|
||||
run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
|
||||
|
||||
run_test 'find commit subject' '
|
||||
grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp
|
||||
grep -e "<div class=.commit-subject.>commit 5<" trash/tmp
|
||||
'
|
||||
|
||||
run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include "html.h"
|
||||
#include "ui-shared.h"
|
||||
#include "ui-diff.h"
|
||||
#include "ui-log.h"
|
||||
|
||||
void cgit_print_commit(char *hex)
|
||||
{
|
||||
@ -34,6 +35,8 @@ void cgit_print_commit(char *hex)
|
||||
}
|
||||
info = cgit_parse_commit(commit);
|
||||
|
||||
load_ref_decorations();
|
||||
|
||||
html("<table summary='commit info' class='commit-info'>\n");
|
||||
html("<tr><th>author</th><td>");
|
||||
html_txt(info->author);
|
||||
@ -87,6 +90,7 @@ void cgit_print_commit(char *hex)
|
||||
html("</table>\n");
|
||||
html("<div class='commit-subject'>");
|
||||
html_txt(info->subject);
|
||||
show_commit_decorations(commit);
|
||||
html("</div>");
|
||||
html("<div class='commit-msg'>");
|
||||
html_txt(info->msg);
|
||||
|
Loading…
Reference in New Issue
Block a user