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

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

Merge pull request #6644 from tombruijn/list-item-name-spacing
.well-list item name spacing fix Follow up on #6643
Dmitriy Zaporozhets
2 parents 48bd8a7e ce857b7c
Showing 10 changed files with 48 additions and 28 deletions Show diff stats
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/sections/dashboard.scss
app/views/admin/groups/show.html.haml
app/views/admin/hooks/index.html.haml
app/views/admin/projects/index.html.haml
app/views/admin/projects/show.html.haml
app/views/admin/users/index.html.haml
app/views/admin/users/show.html.haml
app/views/groups/edit.html.haml
app/views/users_groups/_users_group.html.haml
@@ -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;
@@ -113,6 +113,5 @@
   float: left;
   margin-right: 3px;
   color: #999;
-  margin-bottom: 10px;
   width: 16px;
 }
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
@@ -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?
@@ -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"
@@ -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
...	...	@@ -13,6 +13,12 @@
13	13	border-bottom: 1px solid #eee;
14	14	border-bottom: 1px solid rgba(0, 0, 0, 0.05);
15	15
	16	+ &:after {
	17	+ content: " ";
	18	+ display: table;
	19	+ clear: both;
	20	+ }
	21	+
16	22	&.disabled {
17	23	color: #888;
18	24	}
...	...	@@ -46,6 +52,12 @@
46	52
47	53	.author { color: #999; }
48	54
	55	+ .list-item-name {
	56	+ float: left;
	57	+ position: relative;
	58	+ top: 3px;
	59	+ }
	60	+
49	61	p {
50	62	padding-top: 1px;
51	63	margin: 0;
...	...
...	...	@@ -113,6 +113,5 @@
113	113	float: left;
114	114	margin-right: 3px;
115	115	color: #999;
116		- margin-bottom: 10px;
117	116	width: 16px;
118	117	}
...	...
...	...	@@ -70,8 +70,9 @@
70	70	- @group.users_groups.order('group_access DESC').each do \|member\|
71	71	- user = member.user
72	72	%li{class: dom_class(user)}
73		- %strong
74		- = link_to user.name, admin_user_path(user)
	73	+ .list-item-name
	74	+ %strong
	75	+ = link_to user.name, admin_user_path(user)
75	76	%span.pull-right.light
76	77	= member.human_access
77	78	= 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 @@
28	28	%ul.well-list
29	29	- @hooks.each do \|hook\|
30	30	%li
	31	+ .list-item-name
	32	+ = link_to admin_hook_path(hook) do
	33	+ %strong= hook.url
	34	+
31	35	.pull-right
32	36	= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small"
33	37	= link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
34		- = link_to admin_hook_path(hook) do
35		- %strong= hook.url
...	...
...	...	@@ -44,9 +44,10 @@
44	44	%ul.well-list
45	45	- @projects.each do \|project\|
46	46	%li
47		- %span{ class: visibility_level_color(project.visibility_level) }
48		- = visibility_level_icon(project.visibility_level)
49		- = link_to project.name_with_namespace, [:admin, project]
	47	+ .list-item-name
	48	+ %span{ class: visibility_level_color(project.visibility_level) }
	49	+ = visibility_level_icon(project.visibility_level)
	50	+ = link_to project.name_with_namespace, [:admin, project]
50	51	.pull-right
51	52	%span.label.label-gray
52	53	= repository_size(project)
...	...
...	...	@@ -116,8 +116,9 @@
116	116	- @project.users_projects.each do \|users_project\|
117	117	- user = users_project.user
118	118	%li.users_project
119		- %strong
120		- = link_to user.name, admin_user_path(user)
	119	+ .list-item-name
	120	+ %strong
	121	+ = link_to user.name, admin_user_path(user)
121	122	.pull-right
122	123	- if users_project.owner?
123	124	%span.light Owner
...	...
...	...	@@ -36,15 +36,16 @@
36	36	%ul.well-list
37	37	- @users.each do \|user\|
38	38	%li
39		- - if user.blocked?
40		- %i.icon-lock.cred
41		- - else
42		- %i.icon-user.cgreen
43		- = link_to user.name, [:admin, user]
44		- - if user.admin?
45		- %strong.cred (Admin)
46		- - if user == current_user
47		- %span.cred It's you!
	39	+ .list-item-name
	40	+ - if user.blocked?
	41	+ %i.icon-lock.cred
	42	+ - else
	43	+ %i.icon-user.cgreen
	44	+ = link_to user.name, [:admin, user]
	45	+ - if user.admin?
	46	+ %strong.cred (Admin)
	47	+ - if user == current_user
	48	+ %span.cred It's you!
48	49	.pull-right
49	50	%span.light
50	51	%i.icon-envelope
...	...
...	...	@@ -124,7 +124,8 @@
124	124	- @user.users_groups.each do \|user_group\|
125	125	- group = user_group.group
126	126	%li.users_group
127		- %strong= link_to group.name, admin_group_path(group)
	127	+ %span{class: ("list-item-name" unless user_group.owner?)}
	128	+ %strong= link_to group.name, admin_group_path(group)
128	129	.pull-right
129	130	%span.light= user_group.human_access
130	131	- unless user_group.owner?
...	...
...	...	@@ -73,8 +73,9 @@
73	73	%ul.well-list
74	74	- @group.projects.each do \|project\|
75	75	%li
76		- = visibility_level_icon(project.visibility_level)
77		- = link_to project.name_with_namespace, project
	76	+ .list-item-name
	77	+ = visibility_level_icon(project.visibility_level)
	78	+ = link_to project.name_with_namespace, project
78	79	.pull-right
79	80	= link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
80	81	= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
...	...
...	...	@@ -2,11 +2,12 @@
2	2	- return unless user
3	3	- show_roles = true if show_roles.nil?
4	4	%li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
5		- = image_tag avatar_icon(user.email, 16), class: "avatar s16"
6		- %strong= user.name
7		- %span.cgray= user.username
8		- - if user == current_user
9		- %span.label.label-success It's you
	5	+ %span{class: ("list-item-name" if show_controls)}
	6	+ = image_tag avatar_icon(user.email, 16), class: "avatar s16"
	7	+ %strong= user.name
	8	+ %span.cgray= user.username
	9	+ - if user == current_user
	10	+ %span.label.label-success It's you
10	11
11	12	- if show_roles
12	13	%span.pull-right
...	...	@@ -22,7 +23,7 @@
22	23	- else
23	24	= 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
24	25	%i.icon-minus.icon-white
25		-
	26	+
26	27	.edit-member.hide.js-toggle-content
27	28	= form_for [@group, member], remote: true do \|f\|
28	29	.alert.prepend-top-20
...	...