Changeset - 7ea933acdb8b
[Not reviewed]
default
0 2 0
domruf - 9 years ago 2016-06-24 20:12:05
dominikruf@gmail.com
changelog: add phases tags in changelog
2 files changed with 15 insertions and 1 deletions:
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
Show inline comments
 
@@ -2659,92 +2659,96 @@ BIN_FILENODE = 6
 
}
 

	
 
.right .changes .removed {
 
    background: #FAA;
 
}
 

	
 
.right .merge {
 
    padding: 1px 3px 1px 3px;
 
    background-color: #fca062;
 
    font-size: 10px;
 
    color: #ffffff;
 
    text-transform: uppercase;
 
    white-space: nowrap;
 
    border-radius: 3px;
 
    margin-right: 2px;
 
}
 

	
 
.right .parent {
 
    color: #666666;
 
    clear: both;
 
}
 
.right .logtags {
 
    line-height: 2.2em;
 
}
 
.bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
 
.phasetag, .bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
 
    margin: 0px 2px;
 
}
 

	
 
.phasetag,
 
.bumpedtag,
 
.divergenttag,
 
.extincttag,
 
.unstabletag,
 
.repotag,
 
.branchtag,
 
.tagtag,
 
.booktag,
 
.spantag {
 
    padding: 1px 3px 1px 3px;
 
    font-size: 10px;
 
    color: #577632;
 
    white-space: nowrap;
 
    border-radius: 4px;
 
    border: 1px solid #d9e8f8;
 
    line-height: 1.5em;
 
}
 

	
 
#graph_content .phasetag,
 
#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;
 
}
 

	
 
.phasetag,
 
.bumpedtag,
 
.divergenttag,
 
.extincttag,
 
.unstabletag,
 
.repotag,
 
.branchtag,
 
.tagtag,
 
.booktag {
 
    float: left;
 
}
 

	
 
.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;
 
    line-height: 1em;
 
    margin: 1px 1px !important;
 
    display: block;
 
}
 

	
 
.repotag {
 
    border-color: #56A546;
 
    color: #46A546;
 
    font-size: 8px;
 
    text-transform: uppercase;
 
}
 

	
 
#context-bar .repotag,
 
.repo-icons .repotag {
 
    border-color: white;
 
@@ -2756,48 +2760,53 @@ BIN_FILENODE = 6
 
    margin-top: 0px;
 
    padding-top: 0px;
 
    padding-bottom: 0px;
 
}
 

	
 
.booktag {
 
    border-color: #46A546;
 
    color: #46A546;
 
}
 

	
 
.tagtag {
 
    border-color: #62cffc;
 
    color: #62cffc;
 
}
 

	
 
.bumpedtag,
 
.divergenttag,
 
.extincttag,
 
.unstabletag {
 
    background-color: #f00;
 
    border-color: #600;
 
    color: #fff;
 
}
 

	
 
.phasetag {
 
    border-color: #1F14CE;
 
    color: #1F14CE;
 
}
 

	
 
.logtags .branchtag a:hover,
 
.logtags .branchtag a,
 
.branchtag a,
 
.branchtag a:hover {
 
    text-decoration: none;
 
    color: inherit;
 
}
 
.logtags .tagtag {
 
    padding: 1px 3px 1px 3px;
 
    background-color: #62cffc;
 
    font-size: 10px;
 
    color: #ffffff;
 
    white-space: nowrap;
 
    border-radius: 3px;
 
}
 

	
 
.tagtag a,
 
.tagtag a:hover,
 
.logtags .tagtag a,
 
.logtags .tagtag a:hover {
 
    text-decoration: none;
 
    color: inherit;
 
}
 
.logbooks .booktag,
kallithea/templates/changelog/changelog.html
Show inline comments
 
@@ -129,48 +129,53 @@ ${self.repo_context_bar('changelog', c.f
 
                                                </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 cs.phase:
 
                                        <div class="phasetag" title="Phase">
 
                                            ${cs.phase}
 
                                        </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
 
                                    %endif
 
                                    %for tag in cs.tags:
 
                                        <div class="tagtag" title="${_('Tag %s') % tag}">
 
                                            ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
 
                                        </div>
 
                                    %endfor
 
                                    %if (not c.branch_name) and cs.branch:
 
                                        <div 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>
 
                                    %endif
 
                                </div>
 
                            </div>
 
                        </td>
 
                    </tr>
 
                %endfor
 
                </tbody>
 
                </table>
0 comments (0 inline, 0 general)