use control-group classes for inline forms in profile and group pages

Dmitriy Zaporozhets
1 parent f2082edb
Showing 4 changed files with 22 additions and 22 deletions Show diff stats
app/views/groups/_new_group_member.html.haml
app/views/groups/edit.html.haml
app/views/groups/new.html.haml
app/views/profiles/account.html.haml
@@ -6,14 +6,14 @@
       group
  
     %p 1. Choose users you want in the group
-    .clearfix
+    .control-group
       = f.label :user_ids, "People"
-      .input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
+      .controls= users_select_tag(:user_ids, multiple: true, class: 'input-large')
  
     %p 2. Set access level for them
-    .clearfix
+    .control-group
       = f.label :group_access, "Group Access"
-      .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
+      .controls= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
  
     .form-actions
       = f.submit 'Add users into group', class: "btn btn-create"
@@ -26,15 +26,15 @@
               - if @group.errors.any?
                 .alert.alert-error
                   %span= @group.errors.full_messages.first
-              .clearfix
+              .control-group
                 = f.label :name do
                   Group name is
-                .input
+                .controls
                   = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
  
-              .clearfix.group-description-holder
+              .control-group.group-description-holder
                 = f.label :description, "Details"
-                .input
+                .controls
                   = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  
               .form-actions
@@ -2,19 +2,19 @@
   - if @group.errors.any?
     .alert.alert-error
       %span= @group.errors.full_messages.first
-  .clearfix
+  .control-group
     = f.label :name do
       Group name is
-    .input
+    .controls
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
  
-  .clearfix.group-description-holder
+  .control-group.group-description-holder
     = f.label :description, "Details"
-    .input
+    .controls
       = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  
-  .clearfix
-    .input
+  .control-group
+    .controls
       %ul
         %li Group is kind of directory for several projects
         %li All created groups are private
@@ -27,15 +27,15 @@
               - @user.errors.full_messages.each do |msg|
                 %li= msg
  
-        .clearfix
+        .control-group
           = f.label :password
-          .input= f.password_field :password, required: true
-        .clearfix
+          .controls= f.password_field :password, required: true
+        .control-group
           = f.label :password_confirmation
-          .input
+          .controls
             = f.password_field :password_confirmation, required: true
-        .clearfix
-          .input
+        .control-group
+          .controls
             = f.submit 'Save password', class: "btn btn-save"
  
  
@@ -70,7 +70,7 @@
     = form_for @user, url: update_username_profile_path,  method: :put, remote: true do |f|
       .padded
         = f.label :username
-        .input
+        .controls
           = f.text_field :username, required: true
           &nbsp;
           %span.loading-gif.hide= image_tag "ajax_loader.gif"
@@ -83,7 +83,7 @@
           %ul.cred
             %li It will change web url for personal projects.
             %li It will change the git path to repositories for personal projects.
-        .input
+        .controls
           = f.submit 'Save username', class: "btn btn-save"
  
 - if gitlab_config.signup_enabled
...	...	@@ -6,14 +6,14 @@
6	6	group
7	7
8	8	%p 1. Choose users you want in the group
9		- .clearfix
	9	+ .control-group
10	10	= f.label :user_ids, "People"
11		- .input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
	11	+ .controls= users_select_tag(:user_ids, multiple: true, class: 'input-large')
12	12
13	13	%p 2. Set access level for them
14		- .clearfix
	14	+ .control-group
15	15	= f.label :group_access, "Group Access"
16		- .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
	16	+ .controls= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
17	17
18	18	.form-actions
19	19	= f.submit 'Add users into group', class: "btn btn-create"
...	...
...	...	@@ -26,15 +26,15 @@
26	26	- if @group.errors.any?
27	27	.alert.alert-error
28	28	%span= @group.errors.full_messages.first
29		- .clearfix
	29	+ .control-group
30	30	= f.label :name do
31	31	Group name is
32		- .input
	32	+ .controls
33	33	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
34	34
35		- .clearfix.group-description-holder
	35	+ .control-group.group-description-holder
36	36	= f.label :description, "Details"
37		- .input
	37	+ .controls
38	38	= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
39	39
40	40	.form-actions
...	...
...	...	@@ -2,19 +2,19 @@
2	2	- if @group.errors.any?
3	3	.alert.alert-error
4	4	%span= @group.errors.full_messages.first
5		- .clearfix
	5	+ .control-group
6	6	= f.label :name do
7	7	Group name is
8		- .input
	8	+ .controls
9	9	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
10	10
11		- .clearfix.group-description-holder
	11	+ .control-group.group-description-holder
12	12	= f.label :description, "Details"
13		- .input
	13	+ .controls
14	14	= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
15	15
16		- .clearfix
17		- .input
	16	+ .control-group
	17	+ .controls
18	18	%ul
19	19	%li Group is kind of directory for several projects
20	20	%li All created groups are private
...	...
...	...	@@ -27,15 +27,15 @@
27	27	- @user.errors.full_messages.each do \|msg\|
28	28	%li= msg
29	29
30		- .clearfix
	30	+ .control-group
31	31	= f.label :password
32		- .input= f.password_field :password, required: true
33		- .clearfix
	32	+ .controls= f.password_field :password, required: true
	33	+ .control-group
34	34	= f.label :password_confirmation
35		- .input
	35	+ .controls
36	36	= f.password_field :password_confirmation, required: true
37		- .clearfix
38		- .input
	37	+ .control-group
	38	+ .controls
39	39	= f.submit 'Save password', class: "btn btn-save"
40	40
41	41
...	...	@@ -70,7 +70,7 @@
70	70	= form_for @user, url: update_username_profile_path, method: :put, remote: true do \|f\|
71	71	.padded
72	72	= f.label :username
73		- .input
	73	+ .controls
74	74	= f.text_field :username, required: true
75	75
76	76	%span.loading-gif.hide= image_tag "ajax_loader.gif"
...	...	@@ -83,7 +83,7 @@
83	83	%ul.cred
84	84	%li It will change web url for personal projects.
85	85	%li It will change the git path to repositories for personal projects.
86		- .input
	86	+ .controls
87	87	= f.submit 'Save username', class: "btn btn-save"
88	88
89	89	- if gitlab_config.signup_enabled
...	...