Mercurial > kallithea
changeset 4576:dc5abab268dc
database_edit.png: use new icon-file-zip font
Previously, database_edit.png was used for icon-archive class so those have all
been renamed via a search-and-replace.
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 | Sun, 20 Jul 2014 19:56:13 -0500 |
parents | 252b5cd6cf3b |
children | 23ca3c74abf1 |
files | kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/database_edit.png kallithea/templates/base/base.html kallithea/templates/journal/journal.html kallithea/templates/summary/summary.html |
diffstat | 6 files changed, 8 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Fri Jul 18 18:06:43 2014 -0500 +++ b/kallithea/public/css/contextbar.css Sun Jul 20 19:56:13 2014 -0500 @@ -2,7 +2,6 @@ * Stylesheets for the context bar */ -i.icon-archive { background-image: url("../images/icons/database_edit.png"); } i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');} i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); } i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
--- a/kallithea/public/css/style.css Fri Jul 18 18:06:43 2014 -0500 +++ b/kallithea/public/css/style.css Sun Jul 20 19:56:13 2014 -0500 @@ -525,11 +525,6 @@ background-position: 20px 9px; } -#header #header-inner #quick li ul li a.repos, -#header #header-inner #quick li ul li a.repos:hover { - background-image: url("../images/icons/database_edit.png"); -} - #header #header-inner #quick li ul li a.repos_groups, #header #header-inner #quick li ul li a.repos_groups:hover { background-image: url("../images/icons/database_link.png");
--- a/kallithea/templates/base/base.html Fri Jul 18 18:06:43 2014 -0500 +++ b/kallithea/templates/base/base.html Sun Jul 20 19:56:13 2014 -0500 @@ -72,7 +72,7 @@ <%def name="admin_menu()"> <ul class="admin_menu"> <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li> - <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li> + <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li> <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li> <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li> <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li> @@ -89,7 +89,7 @@ <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)"> <ul> %if repositories: - <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li> + <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li> %endif %if repository_groups: <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li> @@ -400,7 +400,7 @@ } $("#repo_switcher").select2({ - placeholder: '<i class="icon-archive"></i> ${_('Repositories')}', + placeholder: '<i class="icon-database"></i> ${_('Repositories')}', dropdownAutoWidth: true, formatResult: format, formatSelection: format, @@ -411,7 +411,7 @@ dropdownCssClass: "repo-switcher-dropdown", escapeMarkup: function(m){ // don't escape our custom placeholder - if(m.substr(0,28) == '<i class="icon-archive"></i>'){ + if(m.substr(0,29) == '<i class="icon-database"></i>'){ return m; }
--- a/kallithea/templates/journal/journal.html Fri Jul 18 18:06:43 2014 -0500 +++ b/kallithea/templates/journal/journal.html Sun Jul 20 19:56:13 2014 -0500 @@ -54,7 +54,7 @@ <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a> </li> <li id="show_my_li"> - <a id="show_my" href="#my"><i class="icon-archive"></i> ${_('My Repos')}</a> + <a id="show_my" href="#my"><i class="icon-database"></i> ${_('My Repos')}</a> </li> </ul> </div>
--- a/kallithea/templates/summary/summary.html Fri Jul 18 18:06:43 2014 -0500 +++ b/kallithea/templates/summary/summary.html Sun Jul 20 19:56:13 2014 -0500 @@ -124,7 +124,7 @@ %endif %else: <span id="${'zip_link'}"> - <a class="btn btn-small" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-archive"></i> ${_('Download as zip')}</a> + <a class="btn btn-small" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a> </span> ${h.hidden('download_options')} <span style="vertical-align: bottom"> @@ -160,7 +160,7 @@ %if c.authuser.username != 'default': <li class="repo_size"> - <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}','${str(h.get_token())}')"><i class="icon-archive"></i> ${_('Repository Size')}</a> + <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}','${str(h.get_token())}')"><i class="icon-database"></i> ${_('Repository Size')}</a> <span class="stats-bullet" id="repo_size_2"></span> </li> %endif @@ -300,7 +300,7 @@ var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}"; title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text); title_tmpl = title_tmpl.replace('__CS_EXT__',k); - title_tmpl = '<i class="icon-archive"></i> '+ title_tmpl; + title_tmpl = '<i class="icon-file-zip"></i> '+ title_tmpl; var url = tmpl_links[k].replace('__CS__',new_cs.id); var subrepos = $('#archive_subrepos').is(':checked'); url = url.replace('__SUB__',subrepos);