kallithea Changeset - de5f6c9f50b0

Changeset - de5f6c9f50b0

Parent rev.

Child rev.

[Not reviewed]

default

2 6 0

Sean Farley - 11 years ago 2014-07-16 02:15:34
sean.michael.farley@gmail.com

arrow_refresh.png: use new icon-arrows-cw font

8 files changed with 7 insertions and 16 deletions:

kallithea/public/css/bootstrap.css

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/arrow_refresh.png

bin+del

kallithea/public/images/icons/arrow_refresh_small.png

bin+del

kallithea/templates/compare/compare_diff.html

kallithea/templates/journal/journal.html

kallithea/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

kallithea/public/css/bootstrap.css

➞

Show inline comments

@@ @@ -2544,7 +2544,7 @@ input[type="button"].btn-block { @@
   content: "\e030";
+}
-.glyphicon-refresh:before {
+.glyphicon-arrows-cw:before {
   content: "\e031";
+}

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -10,7 +10,6 @@ i.icon-eye-open { background-image: url( @@
 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-'] {

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -3301,14 +3301,6 @@ table.code-browser i[class^='icon-'] { @@
     text-align: left;
+}
 .refresh_icon {
     background: url("../images/icons/arrow_refresh.png") no-repeat scroll
 px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .pull_icon {
     background: url("../images/icons/connect.png") no-repeat scroll 3px;
     padding-left: 20px;

kallithea/public/images/icons/arrow_refresh.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/images/icons/arrow_refresh_small.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -33,7 +33,7 @@ ${self.repo_context_bar('changelog')} @@
                 <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>

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -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>

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -105,7 +105,7 @@ class TestCompareController(TestControll @@
         ## 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&amp;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&amp;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 @@ class TestCompareController(TestControll @@
         ## 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&amp;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&amp;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 @@ class TestCompareController(TestControll @@
         ## 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&amp;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&amp;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 @@ class TestCompareController(TestControll @@
         ## 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&amp;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&amp;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):

0 comments (0 inline, 0 general)