Mercurial > kallithea
changeset 4601:27504cac4127
lock_open.png: replace icon-unlock-* with icon-lock-open-alt
The inline 'style' override has been modified to only leave spacing and sizing
(removing color).
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Tue, 02 Sep 2014 15:56:00 +0200 |
| parents | f14497d6305e |
| children | 961ef96fcc65 |
| files | kallithea/public/css/contextbar.css kallithea/public/images/icons/lock_open.png kallithea/templates/admin/repos/repo_edit_advanced.html kallithea/templates/admin/settings/settings_vcs.html kallithea/templates/base/base.html kallithea/templates/data_table/_dt_elements.html kallithea/tests/functional/test_home.py kallithea/tests/functional/test_summary.py |
| diffstat | 8 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/public/css/contextbar.css Tue Sep 02 15:56:00 2014 +0200 @@ -18,7 +18,6 @@ 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"); } -i.icon-unlock { background-image: url('../images/icons/lock_open.png');} i.icon-plus-sign { background-image: url('../images/icons/add.png');} i.icon-chevron-left:after { content: "\00AB";} i.icon-chevron-right:after { content: "\00BB";}
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Tue Sep 02 15:56:00 2014 +0200 @@ -51,7 +51,7 @@ ${h.hidden('set_unlock', '1')} <button class="btn btn-small" type="submit" onclick="return confirm('${_('Confirm to unlock repository.')}');"> - <i class="icon-unlock"></i> + <i class="icon-lock-open-alt"></i> ${_('Unlock Repository')} </button> ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))}
--- a/kallithea/templates/admin/settings/settings_vcs.html Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/templates/admin/settings/settings_vcs.html Tue Sep 02 15:56:00 2014 +0200 @@ -88,7 +88,7 @@ $(document).ready(function(){ $('#path_unlock').on('click', function(e){ $('#path_unlock_icon').removeClass('icon-lock'); - $('#path_unlock_icon').addClass('icon-unlock'); + $('#path_unlock_icon').addClass('icon-lock-open-alt'); $('#paths_root_path').removeAttr('readonly'); $('#paths_root_path').removeClass('disabled'); })
--- a/kallithea/templates/base/base.html Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/templates/base/base.html Tue Sep 02 15:56:00 2014 +0200 @@ -129,7 +129,7 @@ %if c.db_repo.private: <i class="icon-lock"></i> %else: - <i class="icon-unlock-alt"></i> + <i class="icon-lock-open-alt"></i> %endif ${h.repo_link(c.db_repo.groups_and_repo)} @@ -388,7 +388,7 @@ tmpl += '<i class="icon-lock" style="color: #e85634;"></i> '; } else if(visual_show_public_icon){ - tmpl += '<i class="icon-unlock-alt"></i> '; + tmpl += '<i class="icon-lock-open-alt"></i> '; } tmpl += '</span>'; }
--- a/kallithea/templates/data_table/_dt_elements.html Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/templates/data_table/_dt_elements.html Tue Sep 02 15:56:00 2014 +0200 @@ -77,7 +77,7 @@ %if private and c.visual.show_private_icon: <i class="icon-lock" style="color: #e85634; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Private repository')}"></i> %elif not private and c.visual.show_public_icon: - <i class="icon-unlock-alt" style="color: #999999; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Public repository')}"></i> + <i class="icon-lock-open-alt" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i> %else: <span style="margin: 0px 8px 0px 8px"></span> %endif
--- a/kallithea/tests/functional/test_home.py Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/tests/functional/test_home.py Tue Sep 02 15:56:00 2014 +0200 @@ -21,7 +21,7 @@ response.mustcontain(r'href=\"/%s\"' % HG_REPO) response.mustcontain(r'<i class=\"icon-git\"') - response.mustcontain(r'<i class=\"icon-unlock-alt\"') + response.mustcontain(r'<i class=\"icon-lock-open-alt\"') response.mustcontain("""fixes issue with having custom format for git-log""") response.mustcontain("""/%s/changeset/5f2c6ee195929b0be80749243c18121c9864a3b3""" % GIT_REPO)
--- a/kallithea/tests/functional/test_summary.py Mon Jul 14 23:59:44 2014 -0500 +++ b/kallithea/tests/functional/test_summary.py Tue Sep 02 15:56:00 2014 +0200 @@ -37,7 +37,7 @@ ) #public/private response.mustcontain( - """<i class="icon-unlock-alt">""" + """<i class="icon-lock-open-alt">""" ) # clone url... @@ -57,7 +57,7 @@ ) #public/private response.mustcontain( - """<i class="icon-unlock-alt">""" + """<i class="icon-lock-open-alt">""" ) # clone url... @@ -77,7 +77,7 @@ ) #public/private response.mustcontain( - """<i class="icon-unlock-alt">""" + """<i class="icon-lock-open-alt">""" ) def test_index_by_repo_having_id_path_in_name_hg(self): @@ -106,7 +106,7 @@ ) #public/private response.mustcontain( - """<i class="icon-unlock-alt">""" + """<i class="icon-lock-open-alt">""" ) def _enable_stats(self, repo):