kallithea Changeset - 02fadbd74483

Changeset - 02fadbd74483

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Sean Farley - 11 years ago 2015-02-20 03:01:28
sean.michael.farley@gmail.com

font: fix missing icon-comment-color and icon-comment-alt

We replace the font with our icon-comment one since we can color this with css.

3 files changed with 4 insertions and 4 deletions:

kallithea/lib/helpers.py

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -794,27 +794,27 @@ def action_parser(user_log, feed=False, @@
                                     None, 'icon-fork icon-fork-colored'),
     'admin_updated_repo':          (_('[updated] repository'),
                                     None, 'icon-pencil icon-pencil-colored'),
     'admin_created_user':          (_('[created] user'),
                                     get_user_name, 'icon-user icon-user-colored'),
     'admin_updated_user':          (_('[updated] user'),
                                     get_user_name, 'icon-user icon-user-colored'),
     'admin_created_users_group':   (_('[created] user group'),
                                     get_users_group, 'icon-pencil icon-pencil-colored'),
     'admin_updated_users_group':   (_('[updated] user group'),
                                     get_users_group, 'icon-pencil icon-pencil-colored'),
     'user_commented_revision':     (_('[commented] on revision in repository'),
-                                    get_cs_links, 'icon-comment icon-comment-colored'),
                                     get_cs_links, 'icon-comment'),
     'user_commented_pull_request': (_('[commented] on pull request for'),
-                                    get_pull_request, 'icon-comment icon-comment-colored'),
                                     get_pull_request, 'icon-comment'),
     'user_closed_pull_request':    (_('[closed] pull request for'),
                                     get_pull_request, 'icon-ok'),
     'push':                        (_('[pushed] into'),
                                     get_cs_links, 'icon-move-up'),
     'push_local':                  (_('[committed via Kallithea] into repository'),
                                     get_cs_links, 'icon-pencil icon-pencil-colored'),
     'push_remote':                 (_('[pulled from remote] into repository'),
                                     get_cs_links, 'icon-move-up'),
     'pull':                        (_('[pulled] from'),
                                     None, 'icon-move-down'),
     'started_following_repo':      (_('[started following] repository'),
                                     None, 'icon-heart icon-heart-colored'),

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -23,25 +23,25 @@ @@
                 %else:
                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                 %endif
                 </div>
               %endif
             </div>
         </td>
         <td class="compact">
               %if c.comments.get(cs.raw_id,[]):
                <div class="comments-container">
                    <div title="${('comments')}">
                        <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                          <i class="icon-comment-alt icon-comment-colored"></i>${len(c.comments[cs.raw_id])}
                           <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}
                        </a>
                    </div>
                </div>
               %endif
         </td>
         <td>
             <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
         </td>
         <td>
             ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
         </td>
         <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
         <tr id="chg_${cnt+1}">
         <td style="width:50px">
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
             </div>
           %endif
           %if c.cs_comments.get(cs.raw_id):
               <div class="comments-container">
                   <div class="comments-cnt" title="${_('Changeset has comments')}">
                       <a href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.cs_comments[cs.raw_id][0].comment_id)}">
                           ${len(c.cs_comments[cs.raw_id])}
-                          <i class="icon-comment-alt icon-comment-colored"></i>
                           <i class="icon-comment"></i>
                       </a>
                   </div>
               </div>
           %endif
         </td>
         <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
         <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>
         <td><div class="author">${h.person(cs.author)}</div></td>
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</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>

0 comments (0 inline, 0 general)