# HG changeset patch # User domruf # Date 2017-10-25 23:16:34 # Node ID b66e4d720198303af5801870116413a502ed711b # Parent 73234a550e7d14f97a80f70557c422d3975f314d templates: change .node elements to This way we don't need to make them 'float: left' 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 @@ -1936,9 +1936,6 @@ input.perm_filter { .cs_files .progress { margin-bottom: 0; } -.cs_files .node { - float: left; -} .cs_files .changes { float: right; color: #577632; diff --git a/kallithea/public/less/kallithea-diff.less b/kallithea/public/less/kallithea-diff.less --- a/kallithea/public/less/kallithea-diff.less +++ b/kallithea/public/less/kallithea-diff.less @@ -1,9 +1,6 @@ .cs_files .progress { margin-bottom: 0; } -.cs_files .node { - float: left; -} .cs_files .changes { float: right; color: #577632; diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -152,10 +152,10 @@ ${self.repo_context_bar('changelog', c.c
%for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
-
+ ${h.link_to(h.safe_unicode(path), '#%s' % fid)} -
+
${h.fancy_file_stats(stats)}
%endfor diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -54,10 +54,10 @@ ${self.repo_context_bar('changelog')} <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %> %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
-
+ ${h.link_to(h.safe_unicode(path), '#%s' % fid)} -
+
${h.fancy_file_stats(stats)}
%endfor diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -70,10 +70,10 @@ ${self.repo_context_bar('changelog')} %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
-
+ ${h.link_to(h.safe_unicode(path), '#%s' % fid)} -
+
${h.fancy_file_stats(stats)}
%endfor diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -307,10 +307,10 @@ ${self.repo_context_bar('showpullrequest %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
-
+ ${h.link_to(h.safe_unicode(path), '#%s' % fid)} -
+
${h.fancy_file_stats(stats)}
%endfor diff --git a/kallithea/tests/functional/test_compare_local.py b/kallithea/tests/functional/test_compare_local.py --- a/kallithea/tests/functional/test_compare_local.py +++ b/kallithea/tests/functional/test_compare_local.py @@ -30,48 +30,48 @@ class TestCompareController(TestControll ## files diff response.mustcontain( - '''''') + ''') response.mustcontain( - '''
+ ''' test_and_report.sh''') response.mustcontain( - '''
+ ''' .hgignore''') response.mustcontain( - '''
+ ''' .hgtags''') response.mustcontain( - '''
+ ''' docs/api/index.rst''') response.mustcontain( - '''
+ ''' vcs/__init__.py''') response.mustcontain( - '''
+ ''' vcs/backends/hg.py''') response.mustcontain( - '''
+ ''' vcs/utils/__init__.py''') response.mustcontain( - '''
+ ''' vcs/utils/annotate.py''') response.mustcontain( - '''
+ ''' vcs/utils/diffs.py''') response.mustcontain( - '''
+ ''' vcs/utils/lazy.py''')