kallithea Changeset - b66e4d720198

Changeset - b66e4d720198

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

domruf - 8 years ago 2017-10-25 23:16:34
dominikruf@gmail.com

templates: change .node elements to <span>

This way we don't need to make them 'float: left'

7 files changed with 20 insertions and 26 deletions:

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

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -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;

kallithea/public/less/kallithea-diff.less

➞

Show inline comments

 .cs_files .progress {
   margin-bottom: 0;
+}
 .cs_files .node {
   float: left;
+}
 .cs_files .changes {
   float: right;
   color: #577632;

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -152,10 +152,10 @@ ${self.repo_context_bar('changelog', c.c @@
               <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

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -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:
                             <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

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -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:
                     <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

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -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:
                     <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

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

@@ @@ -30,48 +30,48 @@ class TestCompareController(TestControll @@
         ## 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>''')

0 comments (0 inline, 0 general)