Changeset - bee750d4ffff
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
domruf - 8 years ago 2017-10-25 21:32:39
dominikruf@gmail.com
less: unify .merge and .mergetag
3 files changed with 3 insertions and 5 deletions:
kallithea/public/css/style.css
1
2
kallithea/public/less/kallithea-tags.less
1
2
kallithea/templates/changeset/changeset_range.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -391,194 +391,193 @@ ul#summary-menu-stats {
 
#summary .metatag {
 
  display: inline-block;
 
  padding: 3px 5px;
 
  margin-bottom: 3px;
 
  margin-right: 1px;
 
  border-radius: 5px;
 
}
 
#content div.panel #summary p {
 
  margin-bottom: -5px;
 
  width: 600px;
 
  white-space: pre-wrap;
 
}
 
#clone_by_name.input-group,
 
#clone_by_id.input-group {
 
  width: 100%;
 
}
 
#clone_by_name.input-group > span,
 
#clone_by_id.input-group > span {
 
  display: inline-block;
 
  float: left;
 
  height: 30px;
 
}
 
#clone_by_name.input-group > input,
 
#clone_by_id.input-group > input {
 
  width: 50%;
 
}
 
#clone_by_name.input-group .form-control,
 
#clone_by_id.input-group .form-control {
 
  height: 30px;
 
}
 
.metatag {
 
  display: inline-block;
 
  margin-right: 1px;
 
  border-radius: 4px 4px 4px 4px;
 
  border: solid 1px #9CF;
 
  padding: 2px 3px 2px 3px !important;
 
  background-color: #DEF;
 
}
 
.metatag[data-tag="dead"] {
 
  background-color: #E44;
 
}
 
.metatag[data-tag="stale"] {
 
  background-color: #EA4;
 
}
 
.metatag[data-tag="featured"] {
 
  background-color: #AEA;
 
}
 
.metatag[data-tag="requires"] {
 
  background-color: #9CF;
 
}
 
.metatag[data-tag="recommends"] {
 
  background-color: #BDF;
 
}
 
.metatag[data-tag="lang"] {
 
  background-color: #FAF474;
 
}
 
.metatag[data-tag="license"] {
 
  border: solid 1px #9CF;
 
  background-color: #DEF;
 
}
 
.metatag[data-tag="see"] {
 
  border: solid 1px #CBD;
 
  background-color: #EDF;
 
}
 
a.metatag[data-tag="license"]:hover {
 
  background-color: #577632;
 
  color: #FFF;
 
  text-decoration: none;
 
}
 
#perms .perm_tag {
 
  position: relative;
 
  top: -2px;
 
  margin-left: 3px;
 
  padding: 3px 3px 1px 3px;
 
  font-size: 10px;
 
  font-weight: bold;
 
  text-transform: uppercase;
 
  white-space: nowrap;
 
  border-radius: 3px;
 
}
 
#perms .perm_tag.admin {
 
  background-color: #B94A48;
 
  color: #ffffff;
 
}
 
#perms .perm_tag.write {
 
  background-color: #DB7525;
 
  color: #ffffff;
 
}
 
#perms .perm_tag.read {
 
  background-color: #468847;
 
  color: #ffffff;
 
}
 
#perms .perm_tag.none {
 
  background-color: #bfbfbf;
 
  color: #ffffff;
 
}
 
.right .mergetag,
 
.right .merge {
 
.right .mergetag {
 
  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;
 
}
 
.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;
 
}
 
table#changesets .phasetag,
 
table#changesets .bumpedtag,
 
table#changesets .divergenttag,
 
table#changesets .extincttag,
 
table#changesets .unstabletag,
 
table#changesets .branchtag,
 
table#changesets .tagtag,
 
table#changesets .booktag {
 
  margin: 1.1em 0;
 
  margin-right: 0.5em;
 
}
 
.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 .mergetag,
 
.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;
 
  color: white;
 
  margin-top: 3px;
 
}
 
.repo-icons .repotag {
kallithea/public/less/kallithea-tags.less
➞
Show inline comments
 
.metatag {
 
  display: inline-block;
 
  margin-right: 1px;
 
  border-radius: 4px 4px 4px 4px;
 
  border: solid 1px #9CF;
 
  padding: 2px 3px 2px 3px !important;
 
  background-color: #DEF;
 
}
 
.metatag[data-tag="dead"] {
 
  background-color: #E44;
 
}
 
.metatag[data-tag="stale"] {
 
  background-color: #EA4;
 
}
 
.metatag[data-tag="featured"] {
 
  background-color: #AEA;
 
}
 
.metatag[data-tag="requires"] {
 
  background-color: #9CF;
 
}
 
.metatag[data-tag="recommends"] {
 
  background-color: #BDF;
 
}
 
.metatag[data-tag="lang"] {
 
  background-color: #FAF474;
 
}
 
.metatag[data-tag="license"] {
 
  border: solid 1px #9CF;
 
  background-color: #DEF;
 
}
 
.metatag[data-tag="see"] {
 
  border: solid 1px #CBD;
 
  background-color: #EDF;
 
}
 
a.metatag[data-tag="license"]:hover {
 
  background-color: #577632;
 
  color: #FFF;
 
  text-decoration: none;
 
}
 

			




	
	
	
		
 
#perms .perm_tag {

			




	
	
	
		
 
  position: relative;

			




	
	
	
		
 
  top: -2px;

			




	
	
	
		
 
  margin-left: 3px;

			




	
	
	
		
 
  padding: 3px 3px 1px 3px;

			




	
	
	
		
 
  font-size: 10px;

			




	
	
	
		
 
  font-weight: bold;

			




	
	
	
		
 
  text-transform: uppercase;

			




	
	
	
		
 
  white-space: nowrap;

			




	
	
	
		
 
  border-radius: 3px;

			




	
	
	
		
 
  &.admin {

			




	
	
	
		
 
    background-color: #B94A48;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  &.write {

			




	
	
	
		
 
      background-color: #DB7525;

			




	
	
	
		
 
      color: #ffffff;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  &.read {

			




	
	
	
		
 
      background-color: #468847;

			




	
	
	
		
 
      color: #ffffff;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  &.none {

			




	
	
	
		
 
      background-color: #bfbfbf;

			




	
	
	
		
 
      color: #ffffff;

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .mergetag,

			




	
	
	
		
 
.right .merge {

			




	
	
	
		
 
.right .mergetag {

			




	
	
	
		
 
  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;

			




	
	
	
		
 
}

			




	
	
	
		
 
.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;

			




	
	
	
		
 
}

			




	
	
	
		
 
table#changesets .phasetag,

			




	
	
	
		
 
table#changesets .bumpedtag,

			




	
	
	
		
 
table#changesets .divergenttag,

			




	
	
	
		
 
table#changesets .extincttag,

			




	
	
	
		
 
table#changesets .unstabletag,

			




	
	
	
		
 
table#changesets .branchtag,

			




	
	
	
		
 
table#changesets .tagtag,

			




	
	
	
		
 
table#changesets .booktag {

			




	
	
	
		
 
  margin: 1.1em 0;

			




	
	
	
		
 
  margin-right: 0.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 
.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 .mergetag,

			




	
	
	
		
 
.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;

			




	
	
	
		
 
  color: white;

			




	
	
	
		
 
  margin-top: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.repo-icons .repotag {

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changesets')} -

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0].raw_id))}

			




	
	
	
		
 
    <i class="icon-right"></i>

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1].raw_id))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        <div class="pull-left">

			




	
	
	
		
 
            ${self.breadcrumbs()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="pull-right">

			




	
	
	
		
 
            <a href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
                <table class="table compare_view_commits">

			




	
	
	
		
 
                %for cnt,cs in enumerate(c.cs_ranges):

			




	
	
	
		
 
                  <tr>

			




	
	
	
		
 
                    %if c.visual.use_gravatar:

			




	
	
	
		
 
                    <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    <td>${h.link_to(h.short_id(cs.raw_id),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                    <td class="author">${h.person(cs.author)}</td>

			




	
	
	
		
 
                    <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                      %if c.statuses:

			




	
	
	
		
 
                        <i class="icon-circle changeset-status-${c.statuses[cnt]}" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses[cnt])}"></i>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                  </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
                <h4>${_('Files affected')}</h4>

			




	
	
	
		
 
                <div class="cs_files">

			




	
	
	
		
 
                    %for cs in c.cs_ranges:

			




	
	
	
		
 
                        <h6 class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>

			




	
	
	
		
 
                        <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>

			




	
	
	
		
 
                        %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:

			




	
	
	
		
 
                            <div class="cs_${op} clearfix">

			




	
	
	
		
 
                                <div class="node pull-left">

			




	
	
	
		
 
                                    <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                                    ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                                <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        %endfor

			




	
	
	
		
 
                    %endfor

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for cs in c.cs_ranges:

			




	
	
	
		
 
        <div class="panel-body">

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <div class="h3">

			




	
	
	
		
 
          ${h.gravatar_div(h.email_or_none(cs.author), size=20)}

			




	
	
	
		
 
          <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>

			




	
	
	
		
 
            <div class="right">

			




	
	
	
		
 
              <span class="logtags">

			




	
	
	
		
 
                %if len(cs.parents)>1:

			




	
	
	
		
 
                <span class="merge">${_('Merge')}</span>

			




	
	
	
		
 
                <span class="mergetag">${_('Merge')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                  %for book in cs.bookmarks:

			




	
	
	
		
 
                  <span class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                     ${h.link_to(book,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                    ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if cs.branch:

			




	
	
	
		
 
                <span class="branchtag" title="${_('Branch %s') % cs.branch}">

			




	
	
	
		
 
                   ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>

			




	
	
	
		
 
          ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,

			




	
	
	
		
 
                                  c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.