Mercurial > kallithea

changeset 6112:9dfabbf93361

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add tags in changelog for bumpedtag, divergenttag, extincttag, unstabletag
author domruf <dominikruf@gmail.com>
date Fri, 24 Jun 2016 19:57:04 +0200
parents 9c1fe6f96146
children 7ea933acdb8b
files kallithea/public/css/style.css kallithea/templates/changelog/changelog.html
diffstat 2 files changed, 46 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Fri Jun 24 19:30:27 2016 +0200
+++ b/kallithea/public/css/style.css	Fri Jun 24 19:57:04 2016 +0200
@@ -2680,10 +2680,14 @@
 .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,
@@ -2698,6 +2702,10 @@
     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 {
@@ -2705,6 +2713,10 @@
     margin-right: 0.5em;
 }
 
+.bumpedtag,
+.divergenttag,
+.extincttag,
+.unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
@@ -2712,6 +2724,10 @@
     float: left;
 }
 
+.right .logtags .bumpedtag,
+.right .logtags .divergenttag,
+.right .logtags .extincttag,
+.right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
@@ -2752,6 +2768,15 @@
     color: #62cffc;
 }
 
+.bumpedtag,
+.divergenttag,
+.extincttag,
+.unstabletag {
+    background-color: #f00;
+    border-color: #600;
+    color: #fff;
+}
+
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
--- a/kallithea/templates/changelog/changelog.html	Fri Jun 24 19:30:27 2016 +0200
+++ b/kallithea/templates/changelog/changelog.html	Fri Jun 24 19:57:04 2016 +0200
@@ -130,6 +130,26 @@
                                             </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}">