Mercurial > kallithea
changeset 6417:fe879761c235
style: introduce text-nowrap and avoid using direct white-space: nowrap
Based on work by Dominik Ruf.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sat, 24 Dec 2016 17:26:48 +0100 |
parents | ba18d1f6d081 |
children | e34cf36e024a |
files | kallithea/public/css/style.css kallithea/templates/admin/repo_groups/repo_group_edit_perms.html kallithea/templates/admin/repos/repo_edit_permissions.html kallithea/templates/admin/user_groups/user_group_edit_perms.html kallithea/templates/data_table/_dt_elements.html |
diffstat | 5 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 @@ -988,6 +988,7 @@ margin: 0; padding: 0 0 0 8px; } + #content div.panel table.noborder { border: 1px solid transparent; } @@ -2911,10 +2912,6 @@ width: auto !important; } -table#permissions_manage { - width: 0 !important; -} - table#permissions_manage span.private_repo_msg { font-size: 0.8em; opacity: 0.6; @@ -4484,3 +4481,7 @@ .changes_txt { clear: both; } + +.text-nowrap { + white-space: nowrap; +}
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Sat Dec 24 17:26:48 2016 +0100 @@ -20,7 +20,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'group.read')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin')}</td> - <td style="white-space: nowrap;"> + <td> ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default': <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a> @@ -40,7 +40,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'group.read', disabled="disabled")}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write', disabled="disabled")}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin', disabled="disabled")}</td> - <td style="white-space: nowrap;"> + <td> ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} </td> @@ -56,7 +56,7 @@ <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.read')}</td> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.write')}</td> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.admin')}</td> - <td style="white-space: nowrap;"> + <td> <i class="icon-users"></i> %if h.HasPermissionAny('hg.admin')(): <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Sat Dec 24 17:26:48 2016 +0100 @@ -29,7 +29,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.read')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.write')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')}</td> - <td style="white-space: nowrap;"> + <td> ${h.gravatar(r2p.user.email, size=14)} %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default': <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a> @@ -55,7 +55,7 @@ <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.read')}</td> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td> - <td style="white-space: nowrap;"> + <td> <i class="icon-users"></i> %if h.HasPermissionAny('hg.admin')(): <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a>
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Sat Dec 24 17:26:48 2016 +0100 @@ -20,7 +20,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin')}</td> - <td style="white-space: nowrap;"> + <td> ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default': <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a> @@ -40,7 +40,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read', disabled="disabled")}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write', disabled="disabled")}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin', disabled="disabled")}</td> - <td style="white-space: nowrap;"> + <td> ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} </td> @@ -56,7 +56,7 @@ <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.read')}</td> <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.write')}</td> <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.admin')}</td> - <td style="white-space: nowrap;"> + <td> <i class="icon-users"></i> %if h.HasPermissionAny('hg.admin')(): <a href="${h.url('edit_users_group',id=g2p.user_group.users_group_id)}">
--- a/kallithea/templates/data_table/_dt_elements.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/data_table/_dt_elements.html Sat Dec 24 17:26:48 2016 +0100 @@ -147,14 +147,14 @@ </%def> <%def name="repo_group_name(repo_group_name, children_groups)"> - <div style="white-space: nowrap"> + <div class="text-nowrap"> <a href="${h.url('repos_group_home',group_name=repo_group_name)}"> <i class="icon-folder" title="${_('Repository group')}"></i> ${h.literal(' » '.join(children_groups))}</a> </div> </%def> <%def name="user_group_name(user_group_id, user_group_name)"> - <div style="white-space: nowrap"> + <div class="text-nowrap"> <a href="${h.url('edit_users_group', id=user_group_id)}"> <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a> </div>