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

@@ @@ -2443,24 +2443,25 @@ BIN_FILENODE = 6 @@
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
     display: inline-block;
+}
 .right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
 .right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .merge {
     float: right;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -120,64 +120,64 @@ ${self.repo_context_bar('changelog', c.f @@
                                 <div class="extra-container">
                                     %if c.comments.get(cs.raw_id):
                                         <div class="comments-container">
                                             <div class="comments-cnt" title="${_('Changeset has comments')}">
                                                 <a href="${c.comments[cs.raw_id][0].url()}">
                                                     ${len(c.comments[cs.raw_id])}
                                                     <i class="icon-comment-discussion"></i>
                                                 </a>
                                             </div>
                                         </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>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <input type="checkbox" id="singlerange" style="display:none"/>
                 </div>

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -45,38 +45,38 @@ @@
             <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>
         </td>
         <td>
             ${h.urlify_text(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
         </td>
         <td><span class="tooltip" title="${h.fmt_date(cs.date)}">
                       ${h.age(cs.date)}</span>
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <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>
 %endfor
 </table>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -59,27 +59,27 @@ @@
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
         <td>
         %if cs.branch:
         <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>
         %endif
         </td>
         <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-align-left" style="color:#999"></i>
         </td>
         <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>
         </td>
         </tr>
     %endfor
     </table>
     </div>
     %if c.as_form:
       <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -191,27 +191,27 @@ ${self.repo_context_bar('showpullrequest @@
                         <td colspan="4">${_("Current revision - no change")}</td>
                       %else:
                         <td>
                           %if editable and cs.revision in c.avail_revs:
                             ${h.radio(name='updaterev', value=cs.raw_id)}
                           %endif
                         </td>
                         <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
                         <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>
                         </td>
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>

0 comments (0 inline, 0 general)