kallithea Changeset - d4b39ef6cadf

Changeset - d4b39ef6cadf

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 9 years ago 2016-10-24 21:45:35
madski@unity3d.com

style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping

Based on work by Dominik Ruf.

5 files changed with 27 insertions and 26 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2452,6 +2452,7 @@ BIN_FILENODE = 6 @@
 .tagtag,
 .booktag {
     float: left;
     display: inline-block;
+}
 .right .logtags .phasetag,

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -129,46 +129,46 @@ ${self.repo_context_bar('changelog', c.f @@
                                         </div>
                                     %endif
                                     %if cs.bumped:
-                                        <div class="bumpedtag" title="Bumped">
+                                        <span class="bumpedtag" title="Bumped">
                                             Bumped
-                                        </div>
+                                        </span>
                                     %endif
                                     %if cs.divergent:
-                                        <div class="divergenttag" title="Divergent">
+                                        <span class="divergenttag" title="Divergent">
                                             Divergent
-                                        </div>
+                                        </span>
                                     %endif
                                     %if cs.extinct:
-                                        <div class="extincttag" title="Extinct">
+                                        <span class="extincttag" title="Extinct">
                                             Extinct
-                                        </div>
+                                        </span>
                                     %endif
                                     %if cs.unstable:
-                                        <div class="unstabletag" title="Unstable">
+                                        <span class="unstabletag" title="Unstable">
                                             Unstable
-                                        </div>
+                                        </span>
                                     %endif
                                     %if cs.phase:
-                                        <div class="phasetag" title="Phase">
+                                        <span class="phasetag" title="Phase">
                                             ${cs.phase}
-                                        </div>
+                                        </span>
                                     %endif
                                     %if h.is_hg(c.db_repo_scm_instance):
                                         %for book in cs.bookmarks:
-                                            <div class="booktag" title="${_('Bookmark %s') % book}">
+                                            <span class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                            </div>
+                                            </span>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
-                                        <div class="tagtag" title="${_('Tag %s') % tag}">
+                                        <span class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                        </div>
+                                        </span>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
-                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
+                                        <span class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
-                                        </div>
+                                        </span>
                                     %endif
                                 </div>
                             </div>

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -54,20 +54,20 @@ @@
         <td>
             %if h.is_hg(c.db_repo_scm_instance):
                 %for book in cs.bookmarks:
-                    <div class="booktag" title="${_('Bookmark %s') % book}">
+                    <span class="booktag" title="${_('Bookmark %s') % book}">
                         ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                    </div>
+                    </span>
                 %endfor
             %endif
             %for tag in cs.tags:
-             <div class="tagtag" title="${_('Tag %s') % tag}">
+             <span class="tagtag" title="${_('Tag %s') % tag}">
                  ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-             </div>
+             </span>
             %endfor
             %if cs.branch:
-             <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
+             <span class="branchtag" title="${_('Branch %s' % cs.branch)}">
                  ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
-             </div>
+             </span>
             %endif
         </td>
     </tr>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -68,9 +68,9 @@ @@
         <td>
             <div style="float: right; margin-top: -4px;">
                 %for tag in cs.tags:
-                    <div class="tagtag" title="${_('Tag %s') % tag}">
+                    <span class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                    </div>
+                    </span>
                 %endfor
             </div>
             <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -200,9 +200,9 @@ ${self.repo_context_bar('showpullrequest @@
                         <td>
                           <div style="float: right; margin-top: -4px;">
                             %for tag in cs.tags:
-                              <div class="tagtag" title="${_('Tag %s') % tag}">
+                              <span class="tagtag" title="${_('Tag %s') % tag}">
                                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                              </div>
+                              </span>
                             %endfor
                           </div>
                           <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>

0 comments (0 inline, 0 general)