Mercurial > kallithea

changeset 4589:9930f77b6a79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
group_edit.png: replace icon-group with icon-users 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, 14 Jul 2014 23:34:15 -0500
parents b126bcaad922
children 9ff235be8b48
files kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/group_edit.png kallithea/templates/admin/repos/repo_edit.html kallithea/templates/admin/user_groups/user_group_edit.html kallithea/templates/base/base.html kallithea/templates/data_table/_dt_elements.html
diffstat 7 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/public/css/contextbar.css	Mon Jul 14 23:34:15 2014 -0500
@@ -13,7 +13,6 @@
 i.icon-file { background-image: url("../images/icons/file.png"); }
 i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }
 i.icon-git { background-image: url('../images/icons/giticon.png');}
-i.icon-group { background-image: url("../images/icons/group_edit.png"); }
 i.icon-heart { background-image: url("../images/icons/heart_delete.png"); }
 i.icon-heart-empty { background-image: url("../images/icons/heart.png"); }
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
--- a/kallithea/public/css/style.css	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/public/css/style.css	Mon Jul 14 23:34:15 2014 -0500
@@ -525,11 +525,6 @@
     background-position: 20px 9px;
 }
 
-#header #header-inner #quick li ul li a.groups,
-#header #header-inner #quick li ul li a.groups:hover {
-    background-image: url("../images/icons/group_edit.png");
-}
-
 #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");
Binary file kallithea/public/images/icons/group_edit.png has changed
--- a/kallithea/templates/admin/repos/repo_edit.html	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/templates/admin/repos/repo_edit.html	Mon Jul 14 23:34:15 2014 -0500
@@ -32,7 +32,7 @@
           <!--<li>-->
            <!--<div class="gravatar_box" style="height: 26px">-->
              <!--<div class="gravatar" style="float: left">-->
-                <!--<i class="icon-group" style="font-size: 26px"></i>-->
+                <!--<i class="icon-users" style="font-size: 26px"></i>-->
              <!--</div>-->
                <!--<div style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left">-->
                 <!--<strong>${'repo-info'}</strong>-->
--- a/kallithea/templates/admin/user_groups/user_group_edit.html	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/templates/admin/user_groups/user_group_edit.html	Mon Jul 14 23:34:15 2014 -0500
@@ -32,7 +32,7 @@
           <li>
            <div class="gravatar_box" style="height: 26px">
              <div class="gravatar" style="float: left">
-                <i class="icon-group" style="font-size: 26px"></i>
+                <i class="icon-users" style="font-size: 26px"></i>
              </div>
                <div class="truncate" style="margin:7px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
                 <strong>${c.user_group.users_group_name}</strong>
--- a/kallithea/templates/base/base.html	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/templates/base/base.html	Mon Jul 14 23:34:15 2014 -0500
@@ -75,7 +75,7 @@
       <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></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('users_groups')}"><i class="icon-users"></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>
@@ -95,7 +95,7 @@
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
    %endif
    %if user_groups:
-      <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li>
+      <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
    %endif
   </ul>
 </%def>
--- a/kallithea/templates/data_table/_dt_elements.html	Mon Jul 14 23:33:32 2014 -0500
+++ b/kallithea/templates/data_table/_dt_elements.html	Mon Jul 14 23:34:15 2014 -0500
@@ -216,7 +216,7 @@
 <%def name="user_group_name(user_group_id, user_group_name)">
   <div style="white-space: nowrap">
   <a href="${h.url('edit_users_group', id=user_group_id)}">
-    <i class="icon-group" title="${_('User group')}"></i> ${user_group_name}</a>
+    <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>
   </div>
 </%def>