kallithea Changeset - 25c91454b60d

Changeset - 25c91454b60d

Parent rev.

Child rev.

[Not reviewed]

default

1 5 0

Sean Farley - 11 years ago 2014-10-27 16:59:21
sean.michael.farley@gmail.com

cog.png: use new icon-gear font

A quick search revealed that some old css code was never used, so it was
removed.

6 files changed with 6 insertions and 12 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/cog.png

bin+del

kallithea/templates/admin/settings/settings.html

kallithea/templates/base/base.html

kallithea/templates/data_table/_dt_elements.html

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -7,13 +7,12 @@ i.icon-arrow-right { background-image: u @@
 i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }
 i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
 i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }
 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"); }
 i.icon-file-2 { background-image: url("../images/icons/note.png"); }
 i.icon-file-alt { background-image: url("../images/icons/note_add.png"); }
 i.icon-file { background-image: url("../images/icons/file.png"); }

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -547,17 +547,12 @@ div.header img { @@
 #header #header-inner #quick li ul li a.defaults,
 #header #header-inner #quick li ul li a.defaults:hover {
     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");
+}
 #header #header-inner #quick li ul li a.ldap,

kallithea/public/images/icons/cog.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ @@
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <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>
                </div>
            </div>
           </li>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -76,13 +76,13 @@ @@
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li>
       <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>
 ## admin menu used for people that have some admin resources
@@ @@ -163,13 +163,13 @@ @@
                <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>
              %else:
                <a href="#" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>
              %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)}">
                    <i class="icon-loop"></i> ${_('Compare Fork')}</a></li>
               %endif
               <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li>
@@ @@ -265,20 +265,20 @@ @@
           <i class="icon-search"></i> ${_('Search')}
         </a>
     </li>
     % 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,
                             c.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
     </li>
     % endif

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ @@
        <span>${_('Fork')}</span>
        </a>
     </li>
     <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>
     </li>
   </ul>
 </%def>

0 comments (0 inline, 0 general)