Mercurial > kallithea

changeset 4577:23ca3c74abf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrow_branch.png: replace icon-code-fork with icon-git-pull-request A quick search revealed that some old css code was never used, so it was removed.
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 14 Jul 2014 23:11:16 -0500
parents dc5abab268dc
children a1ea7183c165
files kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/arrow_branch.png kallithea/templates/base/base.html
diffstat 4 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css	Sun Jul 20 19:56:13 2014 -0500
+++ b/kallithea/public/css/contextbar.css	Mon Jul 14 23:11:16 2014 -0500
@@ -6,7 +6,6 @@
 i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }
 i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
 i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }
-i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }
 i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
 i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }
 i.icon-ellipsis-horizontal:after { content: ' ...';}
--- a/kallithea/public/css/style.css	Sun Jul 20 19:56:13 2014 -0500
+++ b/kallithea/public/css/style.css	Mon Jul 14 23:11:16 2014 -0500
@@ -585,11 +585,6 @@
     background-image: url("../images/icons/delete.png");
 }
 
-#header #header-inner #quick li ul li a.branches,
-#header #header-inner #quick li ul li a.branches:hover {
-    background-image: url("../images/icons/arrow_branch.png");
-}
-
 #header #header-inner #quick li ul li a.tags,
 #header #header-inner #quick li ul li a.tags:hover {
     background: #FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
Binary file kallithea/public/images/icons/arrow_branch.png has changed
--- a/kallithea/templates/base/base.html	Sun Jul 20 19:56:13 2014 -0500
+++ b/kallithea/templates/base/base.html	Mon Jul 14 23:11:16 2014 -0500
@@ -192,13 +192,13 @@
                     <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>
                   </a>
                   </li>
-                  <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Fork')}</a></li>
-                  <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Create Pull Request')}</a></li>
+                  <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li>
+                  <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li>
               %endif
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
-          <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-code-fork"></i> ${_('Pull Requests')}
+          <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i> ${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
@@ -285,7 +285,7 @@
 
     <li ${is_current('my_pullrequests')}>
       <a class="menu_link" title="${_('My Pull Requests')}" href="${h.url('my_pullrequests')}">
-        <i class="icon-code-fork"></i> ${_('My Pull Requests')}
+        <i class="icon-git-pull-request"></i> ${_('My Pull Requests')}
         %if c.my_pr_count != 0:
           <span class="menu_link_notifications">${c.my_pr_count}</span>
         %endif