Mercurial > kallithea

changeset 6668:b99cd2bc7540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 11 Jun 2017 15:02:09 +0200
parents 8dd57541a2f7
children 30d61922f24e
files kallithea/public/css/style.css kallithea/templates/changelog/changelog.html kallithea/templates/compare/compare_cs.html
diffstat 3 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Sun Jun 11 15:02:08 2017 +0200
+++ b/kallithea/public/css/style.css	Sun Jun 11 15:02:09 2017 +0200
@@ -1930,12 +1930,13 @@
     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 {
@@ -1989,10 +1990,6 @@
     padding: 0;
 }
 
-#graph_content .log-container {
-    position: relative;
-}
-
 #graph_content .container #singlerange,
 #graph_content .container .changeset_range {
     float: left;
--- a/kallithea/templates/changelog/changelog.html	Sun Jun 11 15:02:08 2017 +0200
+++ b/kallithea/templates/changelog/changelog.html	Sun Jun 11 15:02:09 2017 +0200
@@ -111,7 +111,6 @@
                             <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):
@@ -167,7 +166,6 @@
                                         </span>
                                     %endif
                                 </div>
-                            </div>
                         </td>
                     </tr>
                 %endfor
--- a/kallithea/templates/compare/compare_cs.html	Sun Jun 11 15:02:08 2017 +0200
+++ b/kallithea/templates/compare/compare_cs.html	Sun Jun 11 15:02:09 2017 +0200
@@ -65,10 +65,10 @@
           </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:
@@ -78,7 +78,7 @@
         <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}">