Mercurial > kallithea
changeset 6197:9a523af15c9f
changelog: show merges as semi opaque in more places
Follow up to 8c5d1e94f9ee.
PRs available for updates (those that have a radio button) are not greyed out -
that would make it look too much like they were disabled.
These merges should perhaps be shown in a different way - perhaps not greying
the whole line. But for now, this makes it more consistent.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 12 Sep 2016 17:41:19 +0200 |
| parents | 596393436724 |
| children | 89a548ea164b |
| files | kallithea/public/css/style.css kallithea/templates/changelog/changelog_summary_data.html kallithea/templates/compare/compare_cs.html kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/public/css/style.css Mon Sep 12 17:41:19 2016 +0200 @@ -2120,9 +2120,12 @@ border-color: #cdcdcd; } +#updaterevs-table tr.mergerow, +#graph_content_pr tr.mergerow, +#shortlog_data tr.mergerow, #graph_content #changesets tr.out-of-range, #graph_content #changesets tr.mergerow { - opacity: 0.5; + opacity: 0.6; } #graph_content #changesets td {
--- a/kallithea/templates/changelog/changelog_summary_data.html Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Mon Sep 12 17:41:19 2016 +0200 @@ -11,7 +11,7 @@ <th class="left">${_('Refs')}</th> </tr> %for cnt,cs in enumerate(c.repo_changesets): - <tr class="parity${cnt%2}"> + <tr class="parity${cnt%2} ${'mergerow' if len(cs.parents) > 1 else ''}"> <td class="compact"> <div class="changeset-status-container"> %if c.statuses.get(cs.raw_id):
--- a/kallithea/templates/compare/compare_cs.html Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/templates/compare/compare_cs.html Mon Sep 12 17:41:19 2016 +0200 @@ -18,7 +18,7 @@ <table class="compare_view_commits noborder"> %for cnt, cs in enumerate(reversed(c.cs_ranges)): - <tr id="chg_${cnt+1}"> + <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}"> <td style="width:50px"> %if cs.raw_id in c.statuses: <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon Sep 12 17:41:19 2016 +0200 @@ -181,7 +181,7 @@ </div> <table id="updaterevs-table" class="noborder" style="padding-left:50px"> %for cnt, cs in enumerate(c.avail_cs): - <tr id="chg_available_${cnt+1}"> + <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}"> %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision: <td> %if editable: