Mercurial > kallithea
changeset 4636:de5f6c9f50b0
arrow_refresh.png: use new icon-arrows-cw font
author | Sean Farley <sean.michael.farley@gmail.com> |
---|---|
date | Tue, 15 Jul 2014 19:15:34 -0500 |
parents | 80faf3ee3e92 |
children | 732ccbb5f07c |
files | kallithea/public/css/bootstrap.css kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/arrow_refresh.png kallithea/public/images/icons/arrow_refresh_small.png kallithea/templates/compare/compare_diff.html kallithea/templates/journal/journal.html kallithea/tests/functional/test_compare.py |
diffstat | 8 files changed, 7 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/bootstrap.css Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/public/css/bootstrap.css Tue Jul 15 19:15:34 2014 -0500 @@ -2544,7 +2544,7 @@ content: "\e030"; } -.glyphicon-refresh:before { +.glyphicon-arrows-cw:before { content: "\e031"; }
--- a/kallithea/public/css/contextbar.css Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/public/css/contextbar.css Tue Jul 15 19:15:34 2014 -0500 @@ -10,7 +10,6 @@ i.icon-file-txt { background-image: url("../images/icons/note_error.png"); } i.icon-git { background-image: url('../images/icons/giticon.png');} i.icon-hg { background-image: url('../images/icons/hgicon.png');} -i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');} i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */ i[class^='icon-'] {
--- a/kallithea/public/css/style.css Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/public/css/style.css Tue Jul 15 19:15:34 2014 -0500 @@ -3301,14 +3301,6 @@ text-align: left; } -.refresh_icon { - background: url("../images/icons/arrow_refresh.png") no-repeat scroll - 3px; - padding-left: 20px; - padding-top: 0px; - text-align: left; -} - .pull_icon { background: url("../images/icons/connect.png") no-repeat scroll 3px; padding-left: 20px;
--- a/kallithea/templates/compare/compare_diff.html Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/templates/compare/compare_diff.html Tue Jul 15 19:15:34 2014 -0500 @@ -33,7 +33,7 @@ <div> ${h.hidden('compare_org')} <i class="icon-arrow-right"></i> ${h.hidden('compare_other')} %if not c.compare_home: - <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a> + <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a> %endif <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div> </div>
--- a/kallithea/templates/journal/journal.html Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/templates/journal/journal.html Tue Jul 15 19:15:34 2014 -0500 @@ -32,7 +32,7 @@ ${self.breadcrumbs()} <ul class="links icon-only-links"> <li> - <span><a id="refresh" href="${h.url('journal')}"><i class="icon-refresh"></i></a></span> + <span><a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a></span> </li> <li> <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>
--- a/kallithea/tests/functional/test_compare.py Sun Jul 20 18:41:46 2014 -0500 +++ b/kallithea/tests/functional/test_compare.py Tue Jul 15 19:15:34 2014 -0500 @@ -105,7 +105,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_git(self): self.log_user() @@ -153,7 +153,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): self.log_user() @@ -208,7 +208,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incomming_git(self): self.log_user() @@ -263,7 +263,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_cherry_pick_changesets_from_bottom(self):