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

 /**
  * Stylesheets for the context bar
  */
 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-'] {
     background-repeat: no-repeat;
     background-position: center;
     display: inline-block;
     min-width: 16px;
     min-height: 16px;
     margin: -2px 0 -4px 0;
     /* background-color: red; /* for debugging */
 }

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -492,31 +492,24 @@ div.header img { @@
     width: 100%;
     border-radius: 10px;
     padding: 2px 7px;
+}
 #header #header-inner #quick .repo_switcher_type {
     position: absolute;
     left: 0;
     top: 9px;
     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");
     padding-left: 42px;
     background-position: 20px 9px;
+}
 .groups_breadcrumbs a {
     color: #fff;
+}
 .groups_breadcrumbs a:hover {

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

@@ @@ -89,25 +89,25 @@ @@
               return h.literal('follow')
   %>
   <%
     def is_current(selected):
         if selected == current:
             return h.literal('class="current"')
     %>
   <!--- CONTEXT BAR -->
   <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>
         %endif
         ## public/private
         %if c.db_repo.private:
           <i class="icon-keyhole-circled"></i>
         %else:
           <i class="icon-globe"></i>
         %endif
         ${h.repo_link(c.db_repo.groups_and_repo)}
@@ @@ -351,25 +351,25 @@ @@
         var cache = {}
         /*format the look of items in the list*/
         var format = function(state){
             if (!state.id){
               return state.text; // optgroup
+            }
             var obj_dict = state.obj;
             var tmpl = '';
             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> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-keyhole-circled"></i> ';
+                }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-globe"></i> ';
+                }
                 tmpl += '</span>';
+            }

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -59,25 +59,25 @@ @@
         return name
     %>
   <div style="white-space: nowrap; ${'opacity: 0.5' if rstate == 'repo_state_pending' else ''}}">
     ##NAME
     %if admin:
         <a href="${h.url('edit_repo',repo_name=name)}">
     %else:
         <a href="${h.url('summary_home',repo_name=name)}">
     %endif
     ##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
     ##PRIVATE/PUBLIC
     %if private and c.visual.show_private_icon:
       <i class="icon-keyhole-circled" title="${_('Private repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %elif not private and c.visual.show_public_icon:
       <i class="icon-globe" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %else:
       <span style="margin: 0px 8px 0px 8px"></span>
     %endif

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -24,25 +24,25 @@ fixture = Fixture() @@
 class TestSummaryController(TestController):
     def test_index(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=HG_REPO))
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % HG_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
     def test_index_git(self):
         self.log_user()
@@ @@ -64,25 +64,25 @@ class TestSummaryController(TestControll @@
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % GIT_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
     def test_index_by_id_hg(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='_%s' % ID))
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
     def test_index_by_repo_having_id_path_in_name_hg(self):
         self.log_user()
         fixture.create_repo(name='repo_1')
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='repo_1'))

0 comments (0 inline, 0 general)