Mercurial > kallithea
changeset 6281:d4b39ef6cadf
style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping
Based on work by Dominik Ruf.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 24 Oct 2016 21:45:35 +0200 |
| parents | 9cbf386ea529 |
| children | b52a66c5755f |
| files | 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 |
| diffstat | 5 files changed, 27 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Fri Oct 21 01:01:05 2016 +0200 +++ b/kallithea/public/css/style.css Mon Oct 24 21:45:35 2016 +0200 @@ -2452,6 +2452,7 @@ .tagtag, .booktag { float: left; + display: inline-block; } .right .logtags .phasetag,
--- a/kallithea/templates/changelog/changelog.html Fri Oct 21 01:01:05 2016 +0200 +++ b/kallithea/templates/changelog/changelog.html Mon Oct 24 21:45:35 2016 +0200 @@ -129,46 +129,46 @@ </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>
--- a/kallithea/templates/changelog/changelog_summary_data.html Fri Oct 21 01:01:05 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Mon Oct 24 21:45:35 2016 +0200 @@ -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>
--- a/kallithea/templates/compare/compare_cs.html Fri Oct 21 01:01:05 2016 +0200 +++ b/kallithea/templates/compare/compare_cs.html Mon Oct 24 21:45:35 2016 +0200 @@ -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>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Fri Oct 21 01:01:05 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon Oct 24 21:45:35 2016 +0200 @@ -200,9 +200,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 class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>