# HG changeset patch # User Sean Farley # Date 2015-02-18 00:02:25 # Node ID 0cb4a35d8248c8dd94027539dbc1e463d491c403 # Parent 6872028b8bbcede358b9e02e036655df3c611f73 hgicon.png: use repotag class to make an icon The inline 'style' attribute was modified to remove the color but nothing else, as was discussed with other Kallithea devs, since it makes more sense to leave the spacing until another pass of css refactoring. A quick search revealed that some old css code was never used, so it was removed. diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -4,7 +4,6 @@ i.icon-ellipsis-horizontal:after { content: ' ...';} i.icon-git { background-image: url('../images/icons/giticon.png');} -i.icon-hg { background-image: url('../images/icons/hgicon.png');} i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */ i[class^='icon-'] { diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -501,13 +501,6 @@ div.header img { margin: 0px 2px 0px 2px; } -#header #header-inner #quick li ul li a.hg, -#header #header-inner #quick li ul li a.hg:hover { - background-image: url("../images/icons/hgicon.png"); - padding-left: 42px; - background-position: 20px 9px; -} - #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"); diff --git a/kallithea/public/images/icons/hgicon.png b/kallithea/public/images/icons/hgicon.png deleted file mode 100644 index 60effbc5e613d8c8a6f1418853ded6aa4e599671..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@

%if h.is_hg(c.db_repo): - + hg %endif %if h.is_git(c.db_repo): @@ -360,7 +360,7 @@ if(obj_dict && state.type == 'repo'){ tmpl += ''; if(obj_dict['repo_type'] === 'hg'){ - tmpl += ' '; + tmpl += 'hg '; } else if(obj_dict['repo_type'] === 'git'){ tmpl += ' '; diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html +++ b/kallithea/templates/data_table/_dt_elements.html @@ -68,7 +68,7 @@ ##TYPE OF REPO %if h.is_hg(rtype): - + hg %elif h.is_git(rtype): %endif diff --git a/kallithea/tests/functional/test_summary.py b/kallithea/tests/functional/test_summary.py --- a/kallithea/tests/functional/test_summary.py +++ b/kallithea/tests/functional/test_summary.py @@ -33,7 +33,7 @@ class TestSummaryController(TestControll #repo type response.mustcontain( - """hg""" ) #public/private response.mustcontain( @@ -73,7 +73,7 @@ class TestSummaryController(TestControll #repo type response.mustcontain( - """hg""" ) #public/private response.mustcontain(