Improve alignment of labels in .well-list items
This commit is contained in:
parent
b7225bead8
commit
ce857b7cc9
|
@ -52,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;
|
||||||
|
|
|
@ -70,8 +70,9 @@
|
||||||
- @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)}
|
||||||
%strong
|
.list-item-name
|
||||||
= link_to user.name, admin_user_path(user)
|
%strong
|
||||||
|
= link_to user.name, admin_user_path(user)
|
||||||
%span.pull-right.light
|
%span.pull-right.light
|
||||||
= member.human_access
|
= 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
|
= 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
|
||||||
|
|
|
@ -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,9 +44,10 @@
|
||||||
%ul.well-list
|
%ul.well-list
|
||||||
- @projects.each do |project|
|
- @projects.each do |project|
|
||||||
%li
|
%li
|
||||||
%span{ class: visibility_level_color(project.visibility_level) }
|
.list-item-name
|
||||||
= visibility_level_icon(project.visibility_level)
|
%span{ class: visibility_level_color(project.visibility_level) }
|
||||||
= link_to project.name_with_namespace, [:admin, project]
|
= visibility_level_icon(project.visibility_level)
|
||||||
|
= link_to project.name_with_namespace, [:admin, project]
|
||||||
.pull-right
|
.pull-right
|
||||||
%span.label.label-gray
|
%span.label.label-gray
|
||||||
= repository_size(project)
|
= repository_size(project)
|
||||||
|
|
|
@ -116,8 +116,9 @@
|
||||||
- @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
|
||||||
%strong
|
.list-item-name
|
||||||
= link_to user.name, admin_user_path(user)
|
%strong
|
||||||
|
= link_to user.name, admin_user_path(user)
|
||||||
.pull-right
|
.pull-right
|
||||||
- if users_project.owner?
|
- if users_project.owner?
|
||||||
%span.light Owner
|
%span.light Owner
|
||||||
|
|
|
@ -36,15 +36,16 @@
|
||||||
%ul.well-list
|
%ul.well-list
|
||||||
- @users.each do |user|
|
- @users.each do |user|
|
||||||
%li
|
%li
|
||||||
- if user.blocked?
|
.list-item-name
|
||||||
%i.icon-lock.cred
|
- if user.blocked?
|
||||||
- else
|
%i.icon-lock.cred
|
||||||
%i.icon-user.cgreen
|
- else
|
||||||
= link_to user.name, [:admin, user]
|
%i.icon-user.cgreen
|
||||||
- if user.admin?
|
= link_to user.name, [:admin, user]
|
||||||
%strong.cred (Admin)
|
- if user.admin?
|
||||||
- if user == current_user
|
%strong.cred (Admin)
|
||||||
%span.cred It's you!
|
- if user == current_user
|
||||||
|
%span.cred It's you!
|
||||||
.pull-right
|
.pull-right
|
||||||
%span.light
|
%span.light
|
||||||
%i.icon-envelope
|
%i.icon-envelope
|
||||||
|
|
|
@ -124,7 +124,8 @@
|
||||||
- @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
|
||||||
%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
|
.pull-right
|
||||||
%span.light= user_group.human_access
|
%span.light= user_group.human_access
|
||||||
- unless user_group.owner?
|
- unless user_group.owner?
|
||||||
|
|
|
@ -73,8 +73,9 @@
|
||||||
%ul.well-list
|
%ul.well-list
|
||||||
- @group.projects.each do |project|
|
- @group.projects.each do |project|
|
||||||
%li
|
%li
|
||||||
= visibility_level_icon(project.visibility_level)
|
.list-item-name
|
||||||
= link_to project.name_with_namespace, project
|
= visibility_level_icon(project.visibility_level)
|
||||||
|
= link_to project.name_with_namespace, project
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
|
= 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"
|
= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
|
||||||
|
|
|
@ -2,11 +2,12 @@
|
||||||
- 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)}
|
||||||
= image_tag avatar_icon(user.email, 16), class: "avatar s16"
|
%span{class: ("list-item-name" if show_controls)}
|
||||||
%strong= user.name
|
= image_tag avatar_icon(user.email, 16), class: "avatar s16"
|
||||||
%span.cgray= user.username
|
%strong= user.name
|
||||||
- if user == current_user
|
%span.cgray= user.username
|
||||||
%span.label.label-success It's you
|
- if user == current_user
|
||||||
|
%span.label.label-success It's you
|
||||||
|
|
||||||
- if show_roles
|
- if show_roles
|
||||||
%span.pull-right
|
%span.pull-right
|
||||||
|
|
Loading…
Reference in New Issue