diff options
| -rw-r--r-- | cgit.css | 8 | ||||
| -rw-r--r-- | ui-log.c | 6 |
2 files changed, 13 insertions, 1 deletions
| @@ -685,6 +685,14 @@ div#cgit a.tag-deco { | |||
| 685 | border: solid 1px #777700; | 685 | border: solid 1px #777700; |
| 686 | } | 686 | } |
| 687 | 687 | ||
| 688 | div#cgit a.tag-annotated-deco { | ||
| 689 | color: #000; | ||
| 690 | margin: 0px 0.5em; | ||
| 691 | padding: 0px 0.25em; | ||
| 692 | background-color: #ffcc88; | ||
| 693 | border: solid 1px #777700; | ||
| 694 | } | ||
| 695 | |||
| 688 | div#cgit a.remote-deco { | 696 | div#cgit a.remote-deco { |
| 689 | color: #000; | 697 | color: #000; |
| 690 | margin: 0px 0.5em; | 698 | margin: 0px 0.5em; |
| @@ -65,6 +65,8 @@ void show_commit_decorations(struct commit *commit) | |||
| 65 | return; | 65 | return; |
| 66 | html("<span class='decoration'>"); | 66 | html("<span class='decoration'>"); |
| 67 | while (deco) { | 67 | while (deco) { |
| 68 | struct object_id peeled; | ||
| 69 | int is_annotated = 0; | ||
| 68 | strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1); | 70 | strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1); |
| 69 | switch(deco->type) { | 71 | switch(deco->type) { |
| 70 | case DECORATION_NONE: | 72 | case DECORATION_NONE: |
| @@ -77,7 +79,9 @@ void show_commit_decorations(struct commit *commit) | |||
| 77 | ctx.qry.showmsg, 0); | 79 | ctx.qry.showmsg, 0); |
| 78 | break; | 80 | break; |
| 79 | case DECORATION_REF_TAG: | 81 | case DECORATION_REF_TAG: |
| 80 | cgit_tag_link(buf, NULL, "tag-deco", buf); | 82 | if (!peel_ref(deco->name, &peeled)) |
| 83 | is_annotated = !oidcmp(&commit->object.oid, &peeled); | ||
| 84 | cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf); | ||
| 81 | break; | 85 | break; |
| 82 | case DECORATION_REF_REMOTE: | 86 | case DECORATION_REF_REMOTE: |
| 83 | if (!ctx.repo->enable_remote_branches) | 87 | if (!ctx.repo->enable_remote_branches) |
