Mercurial > kallithea

changeset 4599:be3823704f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrow_inout.png: replace icon-loop with icon-git-compare 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:55:15 -0500
parents 13a984ad8cf2
children f14497d6305e
files kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/arrow_inout.png kallithea/templates/base/base.html kallithea/templates/changelog/changelog.html kallithea/templates/changeset/changeset_range.html kallithea/templates/compare/compare_diff.html kallithea/templates/forks/forks_data.html kallithea/templates/pullrequests/pullrequest_show_all.html
diffstat 9 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/public/css/contextbar.css	Mon Jul 14 23:55:15 2014 -0500
@@ -15,8 +15,6 @@
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
 i.icon-lock { background-image: url('../images/icons/lock.png');}
 i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
-i.icon-loop { background-image: url('../images/icons/arrow_inout.png');}
-i.icon-loop-2 { background-image: url('../images/icons/arrow_inout.png');}
 i.icon-private { background-image: url('../images/icons/private_repo.png');}
 i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');}
 i.icon-tag { background-image: url("../images/icons/tag_blue.png"); }
--- a/kallithea/public/css/style.css	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/public/css/style.css	Mon Jul 14 23:55:15 2014 -0500
@@ -545,11 +545,6 @@
     background-image: url("../images/icons/arrow_join.png") ;
 }
 
-#header #header-inner #quick li ul li a.compare_request,
-#header #header-inner #quick li ul li a.compare_request:hover {
-    background-image: url("../images/icons/arrow_inout.png");
-}
-
 #header #header-inner #quick li ul li a.delete,
 #header #header-inner #quick li ul li a.delete:hover {
     background-image: url("../images/icons/delete.png");
Binary file kallithea/public/images/icons/arrow_inout.png has changed
--- a/kallithea/templates/base/base.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/base/base.html	Mon Jul 14 23:55:15 2014 -0500
@@ -170,9 +170,9 @@
              %endif
               %if c.db_repo.fork:
                <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">
-                   <i class="icon-loop"></i> ${_('Compare Fork')}</a></li>
+                   <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li>
               %endif
-              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li>
+              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li>
 
               <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>
 
--- a/kallithea/templates/changelog/changelog.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/changelog/changelog.html	Mon Jul 14 23:55:15 2014 -0500
@@ -62,7 +62,7 @@
                                 <a id="compare_fork"
                                    title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                    href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
-                                   class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
+                                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
                             %endif
                             ## text and href of open_new_pr is controlled from javascript
                             <a id="open_new_pr" class="btn btn-small"></a>
--- a/kallithea/templates/changeset/changeset_range.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/changeset/changeset_range.html	Mon Jul 14 23:55:15 2014 -0500
@@ -33,7 +33,7 @@
                     ${h.show_id(c.cs_ranges[0])}
                     <i class="icon-arrow-right"></i>
                     ${h.show_id(c.cs_ranges[-1])}
-                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>
+                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a>
                 </div>
             </div>
         </div>
--- a/kallithea/templates/compare/compare_diff.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/compare/compare_diff.html	Mon Jul 14 23:55:15 2014 -0500
@@ -35,7 +35,7 @@
                     %if not c.compare_home:
                         <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>
                     %endif
-                    <div id="compare_revs" class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Revisions')}</div>
+                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
                 </div>
             </div>
         </div>
--- a/kallithea/templates/forks/forks_data.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/forks/forks_data.html	Mon Jul 14 23:55:15 2014 -0500
@@ -18,7 +18,7 @@
                 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s' % c.repo_name)}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
-                   class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Fork')}</a>
+                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html	Mon Jul 14 23:52:52 2014 -0500
+++ b/kallithea/templates/pullrequests/pullrequest_show_all.html	Mon Jul 14 23:55:15 2014 -0500
@@ -35,9 +35,9 @@
              %endif
               <span>
                 %if c.from_:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-loop-2"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
+                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
                 %else:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-loop-2"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
+                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
                 %endif
               </span>
           </li>