kallithea Changeset - b99cd2bc7540

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

kallithea/templates/changelog/changelog.html

kallithea/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1927,18 +1927,19 @@ BIN_FILENODE = 6 @@
     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;
@@ @@ -1986,16 +1987,12 @@ BIN_FILENODE = 6 @@
+}
 #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;
+}

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -108,13 +108,12 @@ ${self.repo_context_bar('changelog', c.f @@
                             <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()}">
@@ @@ -164,13 +163,12 @@ ${self.repo_context_bar('changelog', c.f @@
                                     %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>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -62,26 +62,26 @@ @@
           %>
           <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

0 comments (0 inline, 0 general)