Changeset - b99cd2bc7540
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 8 years ago 2017-06-11 15:02:09
mads@kiilerich.com
style: when dimming rows with merge changesets, only dim author and description, not tooltips

Before, it was dimmed by setting opacity ... but opacity is inherited and can't
be undone further down on the tooltip.
3 files changed with 12 insertions and 17 deletions:
kallithea/public/css/style.css
7
10
kallithea/templates/changelog/changelog.html
2
kallithea/templates/compare/compare_cs.html
5
5
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1909,54 +1909,55 @@ BIN_FILENODE = 6
 

			




	
	
	
		
 
#graph .container_header {

			




	
	
	
		
 
    padding: 10px;

			




	
	
	
		
 
    height: 25px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #rev_range_container {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 0px 0px 0px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #rev_range_clear {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 0px 0px 0px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets {

			




	
	
	
		
 
    table-layout: fixed;

			




	
	
	
		
 
    border-collapse: collapse;

			




	
	
	
		
 
    border-left: none;

			




	
	
	
		
 
    border-right: none;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#updaterevs-table tr.mergerow,

			




	
	
	
		
 
#graph_content_pr tr.mergerow,

			




	
	
	
		
 
#shortlog_data tr.mergerow,

			




	
	
	
		
 
#graph_content #changesets tr.out-of-range,

			




	
	
	
		
 
#graph_content #changesets tr.mergerow {

			




	
	
	
		
 
    opacity: 0.6;

			




	
	
	
		
 
tr.mergerow > td.author .user,

			




	
	
	
		
 
tr.mergerow > td.mid > .message,

			




	
	
	
		
 
tr.mergerow > td.mid > .message > a,

			




	
	
	
		
 
tr.out-of-range > td.author .user,

			




	
	
	
		
 
tr.out-of-range > td.mid > .message,

			




	
	
	
		
 
tr.out-of-range > td.mid > .message > a {

			




	
	
	
		
 
    color: #aaa !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets td {

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    text-overflow: ellipsis;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    height: 31px;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .checkbox {

			




	
	
	
		
 
    width: 14px;

			




	
	
	
		
 
    font-size: 0.85em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .status {

			




	
	
	
		
 
    width: 14px;

			




	
	
	
		
 
    font-size: 0.85em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author {

			




	
	
	
		
 
   width: 105px;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -1968,52 +1969,48 @@ BIN_FILENODE = 6

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets .container .date {

			




	
	
	
		
 
    width: 76px;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content_pr .compare_view_commits .expand_commit,

			




	
	
	
		
 
#graph_content .container .expand_commit {

			




	
	
	
		
 
    width: 24px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets .container .right {

			




	
	
	
		
 
    width: 120px;

			




	
	
	
		
 
    padding-right: 0px;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid {

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .log-container {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container #singlerange,

			




	
	
	
		
 
#graph_content .container .changeset_range {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 6px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author img {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author .user {

			




	
	
	
		
 
    color: #444444;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid .message {

			




	
	
	
		
 
    white-space: pre-wrap;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    height: 1.1em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content_pr .compare_view_commits .message {

			




	
	
	
		
 
    padding: 0 !important;

			




	
	
	
		
 
    height: 1.1em;

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -90,49 +90,48 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




	
	
	
		
 
                                 href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author">

			




	
	
	
		
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
	
		
 
                            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" data-toggle="tooltip" 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:

			




	
	
	
		
 
                                        <span class="bumpedtag" title="Bumped">

			




	
	
	
		
 
                                            Bumped

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.divergent:

			




	
	
	
		
 
                                        <span class="divergenttag" title="Divergent">

			




	
	
	
		
 
                                            Divergent

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.extinct:

			




	
	
	
		
 
                                        <span class="extincttag" title="Extinct">

			




	
	
		
 
@@ -146,49 +145,48 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.phase:

			




	
	
	
		
 
                                        <span class="phasetag" title="Phase">

			




	
	
	
		
 
                                            ${cs.phase}

			




	
	
	
		
 
                                        </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.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.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and 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))}

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <input type="checkbox" id="singlerange" style="display:none"/>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <ul class="pagination">

			




	
	
	
		
 
                    ${c.pagination.pager()}

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                var $checkboxes = $('.changeset_range');

			




	
	
	
		
 

			




	
	
	
		
 
                pyroutes.register('changeset_home', ${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))}, ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e) {

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -44,62 +44,62 @@

			




	
	
	
		
 
                      <a href="${c.cs_comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          ${len(c.cs_comments[cs.raw_id])}

			




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

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="changeset-logical-index">

			




	
	
	
		
 
          <%

			




	
	
	
		
 
              num_cs = len(c.cs_ranges)

			




	
	
	
		
 
              index = num_cs - cnt

			




	
	
	
		
 
              if index == 1:

			




	
	
	
		
 
                  title = _('First (oldest) changeset in this list')

			




	
	
	
		
 
              elif index == num_cs:

			




	
	
	
		
 
                  title = _('Last (most recent) changeset in this list')

			




	
	
	
		
 
              else:

			




	
	
	
		
 
                  title = _('Position in this list of changesets')

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span data-toggle="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
        %if c.visual.use_gravatar:

			




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

			




	
	
	
		
 
        %endif

			




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

			




	
	
	
		
 
        <td class="author">

			




	
	
	
		
 
            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
	
		
 
            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</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>

			




	
	
	
		
 
        %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" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        <td class="mid">

			




	
	
	
		
 
            <div class="pull-right" style="margin-top: -4px;">

			




	
	
	
		
 
                %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
                    </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.is_ajax_preview:

			




	
	
	
		
 
      <h5>

			




	
	
	
		
 
      ## links should perhaps use ('rev', c.a_rev) instead ...

			




	
	
	
		
 
      ${h.link_to(_('Show merge diff'),

			




	
	
	
		
 
        h.url('compare_url',

			




	
	
	
		
 
          repo_name=c.a_repo.repo_name,

			




	
	
	
		
 
          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

			




	
	
	
		
 
          other_repo=c.cs_repo.repo_name,

			




	
	
	
		
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

			




        

    



    


    



    



      

      





    
    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.