kallithea Changeset - 0cb4a35d8248

Changeset - 0cb4a35d8248

Parent rev.

Child rev.

[Not reviewed]

default

1 5 0

Sean Farley - 11 years ago 2015-02-18 00:02:25
sean.michael.farley@gmail.com

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.

6 files changed with 5 insertions and 13 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/hgicon.png

bin+del

kallithea/templates/base/base.html

kallithea/templates/data_table/_dt_elements.html

kallithea/tests/functional/test_summary.py

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -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-'] {

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -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");

kallithea/public/images/icons/hgicon.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -98,7 +98,7 @@ @@
   <div id="context-bar" class="box">
       <h2>
         %if h.is_hg(c.db_repo):
-          <i class="icon-hg" style="color: #576622; font-size: 24px"></i>
+          <span class="repotag">hg</span>
         %endif
         %if h.is_git(c.db_repo):
           <i class="icon-git" style="color: #e85634; font-size: 24px"></i>
@@ @@ -360,7 +360,7 @@ @@
             if(obj_dict && state.type == 'repo'){
                 tmpl += '<span class="repo-icons">';
                 if(obj_dict['repo_type'] === 'hg'){
-                    tmpl += '<i class="icon-hg"></i> ';
+                    tmpl += '<span class="repotag">hg</span> ';
+                }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<i class="icon-git"></i> ';

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -68,7 +68,7 @@ @@
     ##TYPE OF REPO
     %if h.is_hg(rtype):
-        <span title="${_('Mercurial repository')}"><i class="icon-hg" style="color: #576622; font-size: 14px;"></i></span>
+        <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>
     %endif

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -33,7 +33,7 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(
@@ @@ -73,7 +73,7 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(

0 comments (0 inline, 0 general)