Commit 5fef5458 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6644 from tombruijn/list-item-name-spacing

.well-list item name spacing fix Follow up on #6643
parents 48bd8a7e ce857b7c
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
&:after {
content: " ";
display: table;
clear: both;
}
&.disabled { &.disabled {
color: #888; color: #888;
} }
...@@ -46,6 +52,12 @@ ...@@ -46,6 +52,12 @@
.author { color: #999; } .author { color: #999; }
.list-item-name {
float: left;
position: relative;
top: 3px;
}
p { p {
padding-top: 1px; padding-top: 1px;
margin: 0; margin: 0;
......
...@@ -113,6 +113,5 @@ ...@@ -113,6 +113,5 @@
float: left; float: left;
margin-right: 3px; margin-right: 3px;
color: #999; color: #999;
margin-bottom: 10px;
width: 16px; width: 16px;
} }
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
- @group.users_groups.order('group_access DESC').each do |member| - @group.users_groups.order('group_access DESC').each do |member|
- user = member.user - user = member.user
%li{class: dom_class(user)} %li{class: dom_class(user)}
.list-item-name
%strong %strong
= link_to user.name, admin_user_path(user) = link_to user.name, admin_user_path(user)
%span.pull-right.light %span.pull-right.light
......
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
%ul.well-list %ul.well-list
- @hooks.each do |hook| - @hooks.each do |hook|
%li %li
.list-item-name
= link_to admin_hook_path(hook) do
%strong= hook.url
.pull-right .pull-right
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small" = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small"
= link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small" = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
= link_to admin_hook_path(hook) do
%strong= hook.url
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
%li %li
.list-item-name
%span{ class: visibility_level_color(project.visibility_level) } %span{ class: visibility_level_color(project.visibility_level) }
= visibility_level_icon(project.visibility_level) = visibility_level_icon(project.visibility_level)
= link_to project.name_with_namespace, [:admin, project] = link_to project.name_with_namespace, [:admin, project]
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
- @project.users_projects.each do |users_project| - @project.users_projects.each do |users_project|
- user = users_project.user - user = users_project.user
%li.users_project %li.users_project
.list-item-name
%strong %strong
= link_to user.name, admin_user_path(user) = link_to user.name, admin_user_path(user)
.pull-right .pull-right
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
%li %li
.list-item-name
- if user.blocked? - if user.blocked?
%i.icon-lock.cred %i.icon-lock.cred
- else - else
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
- @user.users_groups.each do |user_group| - @user.users_groups.each do |user_group|
- group = user_group.group - group = user_group.group
%li.users_group %li.users_group
%span{class: ("list-item-name" unless user_group.owner?)}
%strong= link_to group.name, admin_group_path(group) %strong= link_to group.name, admin_group_path(group)
.pull-right .pull-right
%span.light= user_group.human_access %span.light= user_group.human_access
......
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
%ul.well-list %ul.well-list
- @group.projects.each do |project| - @group.projects.each do |project|
%li %li
.list-item-name
= visibility_level_icon(project.visibility_level) = visibility_level_icon(project.visibility_level)
= link_to project.name_with_namespace, project = link_to project.name_with_namespace, project
.pull-right .pull-right
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- return unless user - return unless user
- show_roles = true if show_roles.nil? - show_roles = true if show_roles.nil?
%li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)} %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
%span{class: ("list-item-name" if show_controls)}
= image_tag avatar_icon(user.email, 16), class: "avatar s16" = image_tag avatar_icon(user.email, 16), class: "avatar s16"
%strong= user.name %strong= user.name
%span.cgray= user.username %span.cgray= user.username
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment