Changeset - 9930f77b6a79
[Not reviewed]
default
1 6 0
Sean Farley - 11 years ago 2014-07-15 06:34:15
sean.michael.farley@gmail.com
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.
7 files changed with 5 insertions and 11 deletions:
0 comments (0 inline, 0 general)
kallithea/public/css/contextbar.css
Show inline comments
 
@@ -10,13 +10,12 @@ i.icon-code-merge { background-image: ur
 
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 { 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');}
 
i.icon-lock { background-image: url('../images/icons/lock.png');}
 
i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
 
i.icon-loop { background-image: url('../images/icons/arrow_inout.png');}
kallithea/public/css/style.css
Show inline comments
 
@@ -522,17 +522,12 @@ div.header img {
 
#header #header-inner #quick li ul li a.git:hover {
 
    background-image: url("../images/icons/giticon.png");
 
    padding-left: 42px;
 
    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");
 
}
 

	
 
#header #header-inner #quick li ul li a.permissions,
kallithea/public/images/icons/group_edit.png
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/templates/admin/repos/repo_edit.html
Show inline comments
 
@@ -29,13 +29,13 @@ ${self.repo_context_bar('options')}
 
    ##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-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>-->
 
               <!--</div>-->
 
           <!--</div>-->
 
          <!--</li>-->
kallithea/templates/admin/user_groups/user_group_edit.html
Show inline comments
 
@@ -29,13 +29,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-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>
 
               </div>
 
           </div>
 
          </li>
kallithea/templates/base/base.html
Show inline comments
 
@@ -72,13 +72,13 @@
 
<%def name="admin_menu()">
 
  <ul class="admin_menu">
 
      <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li>
 
      <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>
 
      <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
 
  </ul>
 

	
 
@@ -92,13 +92,13 @@
 
      <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
 
   %endif
 
   %if repository_groups:
 
      <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>
 

	
 
<%def name="repo_context_bar(current=None, rev=None)">
 
  <% rev = None if rev == 'tip' else rev %>
kallithea/templates/data_table/_dt_elements.html
Show inline comments
 
@@ -213,13 +213,13 @@
 
  </div>
 
</%def>
 

	
 
<%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>
 

	
 
<%def name="toggle_follow(repo_id)">
 
  <span id="follow_toggle_${repo_id}" class="following" title="${_('Stop following this repository')}"
 
        onclick="javascript:toggleFollowingRepo(this, ${repo_id},'${str(h.get_token())}')">
0 comments (0 inline, 0 general)