Mercurial > kallithea
changeset 4839:1619d9ebc1b9
giticon.png: use repotag class to make an icon
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 | Tue, 17 Feb 2015 15:02:34 -0800 |
| parents | 0cb4a35d8248 |
| children | 49521e9d20cb |
| files | kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/giticon.png 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 | 7 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/public/css/contextbar.css Tue Feb 17 15:02:34 2015 -0800 @@ -3,7 +3,6 @@ */ i.icon-ellipsis-horizontal:after { content: ' ...';} -i.icon-git { background-image: url('../images/icons/giticon.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 Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/public/css/style.css Tue Feb 17 15:02:34 2015 -0800 @@ -501,13 +501,6 @@ margin: 0px 2px 0px 2px; } -#header #header-inner #quick li ul li a.git, -#header #header-inner #quick li ul li a.git:hover { - background-image: url("../images/icons/giticon.png"); - padding-left: 42px; - background-position: 20px 9px; -} - .groups_breadcrumbs a { color: #fff; }
--- a/kallithea/templates/base/base.html Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/templates/base/base.html Tue Feb 17 15:02:34 2015 -0800 @@ -101,7 +101,7 @@ <span class="repotag">hg</span> %endif %if h.is_git(c.db_repo): - <i class="icon-git" style="color: #e85634; font-size: 24px"></i> + <span class="repotag">git</span> %endif ## public/private @@ -363,7 +363,7 @@ tmpl += '<span class="repotag">hg</span> '; } else if(obj_dict['repo_type'] === 'git'){ - tmpl += '<i class="icon-git"></i> '; + tmpl += '<span class="repotag">git</span> '; } if(obj_dict['private']){ tmpl += '<i class="icon-keyhole-circled"></i> ';
--- a/kallithea/templates/data_table/_dt_elements.html Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/templates/data_table/_dt_elements.html Tue Feb 17 15:02:34 2015 -0800 @@ -70,7 +70,7 @@ %if h.is_hg(rtype): <span class="repotag" title="${_('Mercurial repository')}">hg</span> %elif h.is_git(rtype): - <span title="${_('Git repository')}"><i class="icon-git" style="color: #e85634; font-size: 14px;"></i></span> + <span class="repotag" title="${_('Git repository')}">git</span> %endif ##PRIVATE/PUBLIC
--- a/kallithea/tests/functional/test_home.py Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/tests/functional/test_home.py Tue Feb 17 15:02:34 2015 -0800 @@ -20,7 +20,7 @@ response.mustcontain('var data = {"totalRecords": %s' % len(Repository.getAll())) response.mustcontain(r'href=\"/%s\"' % HG_REPO) - response.mustcontain(r'<i class=\"icon-git\"') + response.mustcontain(r'<span class="repotag">git') response.mustcontain(r'<i class=\"icon-globe\"') response.mustcontain("""fixes issue with having custom format for git-log""")
--- a/kallithea/tests/functional/test_summary.py Tue Feb 17 15:02:25 2015 -0800 +++ b/kallithea/tests/functional/test_summary.py Tue Feb 17 15:02:34 2015 -0800 @@ -53,7 +53,7 @@ #repo type response.mustcontain( - """<i class="icon-git" """ + """<span class="repotag">git""" ) #public/private response.mustcontain( @@ -102,7 +102,7 @@ #repo type response.mustcontain( - """<i class="icon-git" """ + """<span class="repotag">git""" ) #public/private response.mustcontain(