[PATCH 1 of 5 v2] giticon.png: use repotag class to make an icon

Thomas De Schampheleire patrickdepinguin at gmail.com
Tue Feb 24 16:36:03 EST 2015


# HG changeset patch
# User Sean Farley <sean.michael.farley at gmail.com>
# Date 1424214154 28800
#      Tue Feb 17 15:02:34 2015 -0800
# Node ID 1619d9ebc1b9b40379c192ddb45e5802ecfb8f2b
# Parent  0cb4a35d8248c8dd94027539dbc1e463d491c403
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.

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
@@ -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-'] {
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 @@
     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;
 }
diff --git a/kallithea/public/images/icons/giticon.png b/kallithea/public/images/icons/giticon.png
deleted file mode 100644
index 3f909ea413d66fb362b1991c22c869b36909891c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -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> ';
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
@@ -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
diff --git a/kallithea/tests/functional/test_home.py b/kallithea/tests/functional/test_home.py
--- a/kallithea/tests/functional/test_home.py
+++ b/kallithea/tests/functional/test_home.py
@@ -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""")
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
@@ -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(


More information about the kallithea-general mailing list