diff options
author | Tom de Bruijn <tom@tomdebruijn.com> | 2014-03-26 11:25:02 +0400 |
---|---|---|
committer | Tom de Bruijn <tom@tomdebruijn.com> | 2014-03-28 16:22:43 +0400 |
commit | ce857b7cc983172e35dca36f950864d693cfdf2b (patch) | |
tree | 819e77d7d589e8424b82ab3499c450208bc1ab5d | |
parent | b7225bead8ecf8664c898029648925556be8553d (diff) |
Improve alignment of labels in .well-list items
-rw-r--r-- | app/assets/stylesheets/generic/lists.scss | 6 | ||||
-rw-r--r-- | app/views/admin/groups/show.html.haml | 5 | ||||
-rw-r--r-- | app/views/admin/hooks/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/projects/index.html.haml | 7 | ||||
-rw-r--r-- | app/views/admin/projects/show.html.haml | 5 | ||||
-rw-r--r-- | app/views/admin/users/index.html.haml | 19 | ||||
-rw-r--r-- | app/views/admin/users/show.html.haml | 3 | ||||
-rw-r--r-- | app/views/groups/edit.html.haml | 5 | ||||
-rw-r--r-- | app/views/users_groups/_users_group.html.haml | 13 |
9 files changed, 42 insertions, 27 deletions
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss index 8a6d7f68175..963768044d5 100644 --- a/app/assets/stylesheets/generic/lists.scss +++ b/app/assets/stylesheets/generic/lists.scss @@ -52,6 +52,12 @@ .author { color: #999; } + .list-item-name { + float: left; + position: relative; + top: 3px; + } + p { padding-top: 1px; margin: 0; diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 252111875fa..6055865b4cb 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -70,8 +70,9 @@ - @group.users_groups.order('group_access DESC').each do |member| - user = member.user %li{class: dom_class(user)} - %strong - = link_to user.name, admin_user_path(user) + .list-item-name + %strong + = link_to user.name, admin_user_path(user) %span.pull-right.light = member.human_access = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index ff90d513ca1..60773c20097 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/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 diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 5f19d21f106..296094ab29c 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -44,9 +44,10 @@ %ul.well-list - @projects.each do |project| %li - %span{ class: visibility_level_color(project.visibility_level) } - = visibility_level_icon(project.visibility_level) - = link_to project.name_with_namespace, [:admin, project] + .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] .pull-right %span.label.label-gray = repository_size(project) diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 34a91cce163..11f07743ace 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -116,8 +116,9 @@ - @project.users_projects.each do |users_project| - user = users_project.user %li.users_project - %strong - = link_to user.name, admin_user_path(user) + .list-item-name + %strong + = link_to user.name, admin_user_path(user) .pull-right - if users_project.owner? %span.light Owner diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 0b3934a712d..f42ae7c6a01 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -36,15 +36,16 @@ %ul.well-list - @users.each do |user| %li - - if user.blocked? - %i.icon-lock.cred - - else - %i.icon-user.cgreen - = link_to user.name, [:admin, user] - - if user.admin? - %strong.cred (Admin) - - if user == current_user - %span.cred It's you! + .list-item-name + - if user.blocked? + %i.icon-lock.cred + - else + %i.icon-user.cgreen + = link_to user.name, [:admin, user] + - if user.admin? + %strong.cred (Admin) + - if user == current_user + %span.cred It's you! .pull-right %span.light %i.icon-envelope diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index d66119e2712..764b34499ab 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -124,7 +124,8 @@ - @user.users_groups.each do |user_group| - group = user_group.group %li.users_group - %strong= link_to group.name, admin_group_path(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 - unless user_group.owner? diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 9308bd8124e..500c37ab71d 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -73,8 +73,9 @@ %ul.well-list - @group.projects.each do |project| %li - = visibility_level_icon(project.visibility_level) - = link_to project.name_with_namespace, project + .list-item-name + = visibility_level_icon(project.visibility_level) + = link_to project.name_with_namespace, project .pull-right = link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/users_groups/_users_group.html.haml index 1784dab35b4..ad363eaba23 100644 --- a/app/views/users_groups/_users_group.html.haml +++ b/app/views/users_groups/_users_group.html.haml @@ -2,11 +2,12 @@ - return unless user - show_roles = true if show_roles.nil? %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)} - = image_tag avatar_icon(user.email, 16), class: "avatar s16" - %strong= user.name - %span.cgray= user.username - - if user == current_user - %span.label.label-success It's you + %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 + - if user == current_user + %span.label.label-success It's you - if show_roles %span.pull-right @@ -22,7 +23,7 @@ - else = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do %i.icon-minus.icon-white - + .edit-member.hide.js-toggle-content = form_for [@group, member], remote: true do |f| .alert.prepend-top-20 |