kallithea Changeset - 9dfabbf93361

Changeset - 9dfabbf93361

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 9 years ago 2016-06-24 19:57:04
dominikruf@gmail.com

changelog: add tags in changelog for bumpedtag, divergenttag, extincttag, unstabletag

2 files changed with 46 insertions and 1 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2677,16 +2677,20 @@ BIN_FILENODE = 6 @@
     color: #666666;
     clear: both;
+}
 .right .logtags {
     line-height: 2.2em;
+}
 .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
+.bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
@@ @@ -2695,26 +2699,38 @@ BIN_FILENODE = 6 @@
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .bumpedtag,
 #graph_content .divergenttag,
 #graph_content .extincttag,
 #graph_content .unstabletag,
 #graph_content .branchtag,
 #graph_content .tagtag,
 #graph_content .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
+}
 .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;
     line-height: 1em;
@@ @@ -2749,12 +2765,21 @@ BIN_FILENODE = 6 @@
 .tagtag {
     border-color: #62cffc;
     color: #62cffc;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag {
     background-color: #f00;
     border-color: #600;
     color: #fff;
+}
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
 .branchtag a:hover {
     text-decoration: none;
     color: inherit;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -127,12 +127,32 @@ ${self.repo_context_bar('changelog', c.f @@
                                                     ${len(c.comments[cs.raw_id])}
                                                     <i class="icon-comment-discussion"></i>
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if cs.bumped:
                                         <div class="bumpedtag" title="Bumped">
                                             Bumped
                                         </div>
                                     %endif
                                     %if cs.divergent:
                                         <div class="divergenttag" title="Divergent">
                                             Divergent
                                         </div>
                                     %endif
                                     %if cs.extinct:
                                         <div class="extincttag" title="Extinct">
                                             Extinct
                                         </div>
                                     %endif
                                     %if cs.unstable:
                                         <div class="unstabletag" title="Unstable">
                                             Unstable
                                         </div>
                                     %endif
                                     %if h.is_hg(c.db_repo_scm_instance):
                                         %for book in cs.bookmarks:
                                             <div class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor

0 comments (0 inline, 0 general)