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

.well-list item name spacing fix Follow up on #6643

app/assets/stylesheets/generic/lists.scss

@@ -13,6 +13,12 @@
     border-bottom: 1px solid #eee;
     border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 
+    &:after {
+      content: " ";
+      display: table;
+      clear: both;
+    }
+
     &.disabled {
       color: #888;
     }
@@ -46,6 +52,12 @@
 
     .author { color: #999; }
 
+    .list-item-name {
+      float: left;
+      position: relative;
+      top: 3px;
+    }
+
     p {
       padding-top: 1px;
       margin: 0;

app/assets/stylesheets/sections/dashboard.scss

@@ -113,6 +113,5 @@
   float: left;
   margin-right: 3px;
   color: #999;
-  margin-bottom: 10px;
   width: 16px;
 }

app/views/admin/groups/show.html.haml

@@ -70,6 +70,7 @@
         - @group.users_groups.order('group_access DESC').each do |member|
           - user = member.user
           %li{class: dom_class(user)}
+            .list-item-name
               %strong
                 = link_to user.name, admin_user_path(user)
             %span.pull-right.light

app/views/admin/hooks/index.html.haml

@@ -28,8 +28,10 @@
     %ul.well-list
       - @hooks.each do |hook|
         %li
+          .list-item-name
+            = link_to admin_hook_path(hook) do
+              %strong= hook.url
+
           .pull-right
             = 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 admin_hook_path(hook) do
-            %strong= hook.url

app/views/admin/projects/index.html.haml

@@ -44,6 +44,7 @@
       %ul.well-list
         - @projects.each do |project|
           %li
+            .list-item-name
               %span{ class: visibility_level_color(project.visibility_level) }
                 = visibility_level_icon(project.visibility_level)
               = link_to project.name_with_namespace, [:admin, project]

app/views/admin/projects/show.html.haml

@@ -116,6 +116,7 @@
         - @project.users_projects.each do |users_project|
           - user = users_project.user
           %li.users_project
+            .list-item-name
               %strong
                 = link_to user.name, admin_user_path(user)
             .pull-right

app/views/admin/users/index.html.haml

@@ -36,6 +36,7 @@
       %ul.well-list
         - @users.each do |user|
           %li
+            .list-item-name
               - if user.blocked?
                 %i.icon-lock.cred
               - else

app/views/admin/users/show.html.haml

@@ -124,6 +124,7 @@
           - @user.users_groups.each do |user_group|
             - group = user_group.group
             %li.users_group
+              %span{class: ("list-item-name" unless user_group.owner?)}
                 %strong= link_to group.name, admin_group_path(group)
               .pull-right
                 %span.light= user_group.human_access

app/views/groups/edit.html.haml

@@ -73,6 +73,7 @@
           %ul.well-list
             - @group.projects.each do |project|
               %li
+                .list-item-name
                   = visibility_level_icon(project.visibility_level)
                   = link_to project.name_with_namespace, project
                 .pull-right

app/views/users_groups/_users_group.html.haml

@@ -2,6 +2,7 @@
 - return unless user
 - show_roles = true if show_roles.nil?
 %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"
     %strong= user.name
     %span.cgray= user.username