diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -2375,6 +2375,10 @@ BIN_FILENODE = 6 border-color: #cdcdcd; } +#graph_content #changesets tr.mergerow { + opacity: 0.5; +} + #graph_content #changesets td { overflow: hidden; text-overflow: ellipsis; diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -78,7 +78,7 @@ ${self.repo_context_bar('changelog', c.f
| %if c.changelog_for_path: ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")} diff --git a/kallithea/tests/functional/test_changelog.py b/kallithea/tests/functional/test_changelog.py --- a/kallithea/tests/functional/test_changelog.py +++ b/kallithea/tests/functional/test_changelog.py @@ -8,7 +8,7 @@ class TestChangelogController(TestContro response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO)) - response.mustcontain('''id="chg_20" class="container"''') + response.mustcontain('''id="chg_20" class="container mergerow"''') response.mustcontain( """ |