Mercurial > kallithea
changeset 6979:b66e4d720198
templates: change .node elements to <span>
This way we don't need to make them 'float: left'
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Wed, 25 Oct 2017 23:16:34 +0200 |
| parents | 73234a550e7d |
| children | ceaa65df5add |
| files | kallithea/public/css/style.css kallithea/public/less/kallithea-diff.less kallithea/templates/changeset/changeset.html kallithea/templates/changeset/changeset_range.html kallithea/templates/compare/compare_diff.html kallithea/templates/pullrequests/pullrequest_show.html kallithea/tests/functional/test_compare_local.py |
| diffstat | 7 files changed, 20 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/public/css/style.css Wed Oct 25 23:16:34 2017 +0200 @@ -1936,9 +1936,6 @@ .cs_files .progress { margin-bottom: 0; } -.cs_files .node { - float: left; -} .cs_files .changes { float: right; color: #577632;
--- a/kallithea/public/less/kallithea-diff.less Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/public/less/kallithea-diff.less Wed Oct 25 23:16:34 2017 +0200 @@ -1,9 +1,6 @@ .cs_files .progress { margin-bottom: 0; } -.cs_files .node { - float: left; -} .cs_files .changes { float: right; color: #577632;
--- a/kallithea/templates/changeset/changeset.html Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Wed Oct 25 23:16:34 2017 +0200 @@ -152,10 +152,10 @@ <div class="cs_files"> %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data: <div class="cs_${op} clearfix"> - <div class="node"> + <span class="node"> <i class="icon-diff-${op}"></i> ${h.link_to(h.safe_unicode(path), '#%s' % fid)} - </div> + </span> <div class="changes">${h.fancy_file_stats(stats)}</div> </div> %endfor
--- a/kallithea/templates/changeset/changeset_range.html Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Wed Oct 25 23:16:34 2017 +0200 @@ -54,10 +54,10 @@ <% 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: <div class="cs_${op} clearfix"> - <div class="node"> + <span class="node"> <i class="icon-diff-${op}"></i> ${h.link_to(h.safe_unicode(path), '#%s' % fid)} - </div> + </span> <div class="changes">${h.fancy_file_stats(stats)}</div> </div> %endfor
--- a/kallithea/templates/compare/compare_diff.html Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/templates/compare/compare_diff.html Wed Oct 25 23:16:34 2017 +0200 @@ -70,10 +70,10 @@ %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data: <div class="cs_${op} clearfix"> - <div class="node"> + <span class="node"> <i class="icon-diff-${op}"></i> ${h.link_to(h.safe_unicode(path), '#%s' % fid)} - </div> + </span> <div class="changes">${h.fancy_file_stats(stats)}</div> </div> %endfor
--- a/kallithea/templates/pullrequests/pullrequest_show.html Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed Oct 25 23:16:34 2017 +0200 @@ -307,10 +307,10 @@ %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data: <div class="cs_${op} clearfix"> - <div class="node"> + <span class="node"> <i class="icon-diff-${op}"></i> ${h.link_to(h.safe_unicode(path), '#%s' % fid)} - </div> + </span> <div class="changes">${h.fancy_file_stats(stats)}</div> </div> %endfor
--- a/kallithea/tests/functional/test_compare_local.py Wed Oct 25 23:08:41 2017 +0200 +++ b/kallithea/tests/functional/test_compare_local.py Wed Oct 25 23:16:34 2017 +0200 @@ -30,48 +30,48 @@ ## files diff response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-A"></i> <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a> - </div>''') + </span>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-A"></i> <a href="#C--e3305437df55">test_and_report.sh</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--c8e92ef85cd1">.hgignore</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--6e08b694d687">.hgtags</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--2c14b00f3393">docs/api/index.rst</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''') response.mustcontain( - '''<div class="node"> + '''<span class="node"> <i class="icon-diff-M"></i> <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')