Mercurial > kallithea

changeset 4574:25c91454b60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cog.png: use new icon-gear font 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 Mon, 27 Oct 2014 08:59:21 -0700
parents 4699f6eb5f70
children 252b5cd6cf3b
files kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/cog.png kallithea/templates/admin/settings/settings.html kallithea/templates/base/base.html kallithea/templates/data_table/_dt_elements.html
diffstat 6 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css	Mon Jul 14 22:40:26 2014 -0500
+++ b/kallithea/public/css/contextbar.css	Mon Oct 27 08:59:21 2014 -0700
@@ -10,7 +10,6 @@
 i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }
 i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
 i.icon-cog { background-image: url("../images/icons/cog_edit.png"); }
-i.icon-cog { background-image: url("../images/icons/cog.png"); }
 i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }
 i.icon-ellipsis-horizontal:after { content: ' ...';}
 i.icon-eye-open { background-image: url("../images/icons/eye.png"); }
--- a/kallithea/public/css/style.css	Mon Jul 14 22:40:26 2014 -0500
+++ b/kallithea/public/css/style.css	Mon Oct 27 08:59:21 2014 -0700
@@ -550,11 +550,6 @@
     background-image: url("../images/icons/wrench.png");
 }
 
-#header #header-inner #quick li ul li a.settings,
-#header #header-inner #quick li ul li a.settings:hover {
-    background-image: url("../images/icons/cog.png");
-}
-
 #header #header-inner #quick li ul li a.permissions,
 #header #header-inner #quick li ul li a.permissions:hover {
     background-image: url("../images/icons/key.png");
Binary file kallithea/public/images/icons/cog.png has changed
--- a/kallithea/templates/admin/settings/settings.html	Mon Jul 14 22:40:26 2014 -0500
+++ b/kallithea/templates/admin/settings/settings.html	Mon Oct 27 08:59:21 2014 -0700
@@ -30,7 +30,7 @@
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
-                <i class="icon-cog" style="font-size: 26px"></i>
+                <i class="icon-gear" style="font-size: 26px"></i>
                </div>
                <div style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left">
                 <strong>${_('Settings')}</strong>
--- a/kallithea/templates/base/base.html	Mon Jul 14 22:40:26 2014 -0500
+++ b/kallithea/templates/base/base.html	Mon Oct 27 08:59:21 2014 -0700
@@ -79,7 +79,7 @@
       <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></i> ${_('Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li>
-      <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-cog"></i> ${_('Settings')}</a></li>
+      <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
   </ul>
 
 </%def>
@@ -166,7 +166,7 @@
              %endif
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
-                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-cog"></i> ${_('Settings')}</a></li>
+                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
              %endif
               %if c.db_repo.fork:
                <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">
@@ -268,14 +268,14 @@
     % if h.HasPermissionAll('hg.admin')('access admin main page'):
       <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}" href="${h.url('admin_home')}">
-          <i class="icon-cog"></i> ${_('Admin')}
+          <i class="icon-gear"></i> ${_('Admin')}
         </a>
         ${admin_menu()}
       </li>
     % elif c.authuser.repositories_admin or c.authuser.repository_groups_admin or c.authuser.user_groups_admin:
     <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}">
-          <i class="icon-cog"></i> ${_('Admin')}
+          <i class="icon-gear"></i> ${_('Admin')}
         </a>
         ${admin_menu_simple(c.authuser.repositories_admin,
                             c.authuser.repository_groups_admin,
--- a/kallithea/templates/data_table/_dt_elements.html	Mon Jul 14 22:40:26 2014 -0500
+++ b/kallithea/templates/data_table/_dt_elements.html	Mon Oct 27 08:59:21 2014 -0700
@@ -42,7 +42,7 @@
     <li>
        <a title="${_('Settings')}" href="${h.url('edit_repo',repo_name=repo_name)}">
        <span class="icon">
-           <i class="icon-cog"></i>
+           <i class="icon-gear"></i>
        </span>
        <span>${_('Settings')}</span>
        </a>