Update form classes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

37 files changed, 230 insertions, 230 deletions

diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 043ce4fd817..220bf759cea 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -11,30 +11,30 @@
     .alert.alert-error
       - @broadcast_message.errors.full_messages.each do |msg|
         %p= msg
-  .control-group
+  .form-group
     = f.label :message
-    .controls
+    .col-sm-10
       = f.text_area :message, class: "input-xxlarge", rows: 2, required: true
       %div
         = link_to '#', class: 'js-toggle-colors-link' do
           Customize colors
-  .control-group.js-toggle-colors-container.gl-hide
+  .form-group.js-toggle-colors-container.gl-hide
     = f.label :color, "Background Color"
-    .controls
+    .col-sm-10
       = f.text_field :color, placeholder: "#AA33EE"
       .light Hex values as 3 double digit numbers, starting with a # sign.
-  .control-group.js-toggle-colors-container.gl-hide
+  .form-group.js-toggle-colors-container.gl-hide
     = f.label :font, "Font Color"
-    .controls
+    .col-sm-10
       = f.text_field :font, placeholder: "#224466"
       .light Hex values as 3 double digit numbers, starting with a # sign.
-  .control-group
+  .form-group
     = f.label :starts_at
-    .controls.datetime-controls
+    .col-sm-10.datetime-controls
       = f.datetime_select :starts_at
-  .control-group
+  .form-group
     = f.label :ends_at
-    .controls.datetime-controls
+    .col-sm-10.datetime-controls
       = f.datetime_select :ends_at
   .form-actions
     = f.submit "Add broadcast message", class: "btn btn-create"
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 3918bf981a2..c7d87448f1d 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -4,21 +4,21 @@
   - if @group.errors.any?
     .alert.alert-error
       %span= @group.errors.full_messages.first
-  .control-group.group_name_holder
+  .form-group.group_name_holder
     = f.label :name do
       Group name
-    .controls
+    .col-sm-10
       = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
 
-  .control-group.group-description-holder
+  .form-group.group-description-holder
     = f.label :description, "Details"
-    .controls
+    .col-sm-10
       = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
 
-  .control-group.group_name_holder
+  .form-group.group_name_holder
     = f.label :path do
       %span.cred Group path
-    .controls
+    .col-sm-10
       = f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
       %ul.cred
         %li Changing group path can have unintended side effects.
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index cfbe6b5ee5a..76e49dbbcde 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -4,14 +4,14 @@
   - if @group.errors.any?
     .alert.alert-error
       %span= @group.errors.full_messages.first
-  .control-group
+  .form-group
     = f.label :name do
       Group name
-    .controls
+    .col-sm-10
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
-  .control-group.group-description-holder
+  .form-group.group-description-holder
     = f.label :description, "Details"
-    .controls
+    .col-sm-10
       = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
 
   .form-actions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 84546a75142..681ba14f3d5 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -13,9 +13,9 @@
     .alert.alert-error
       - @hook.errors.full_messages.each do |msg|
         %p= msg
-  .control-group
+  .form-group
     = f.label :url, "URL:"
-    .controls
+    .col-sm-10
       = f.text_field :url, class: "text_field input-xxlarge input-xpadding"
        
       = f.submit "Add System Hook", class: "btn btn-create"
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index dad75678ddb..3e66dbe56b5 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -2,32 +2,32 @@
   .col-md-4
     .admin-filter
       = form_tag admin_projects_path, method: :get, class: 'form-inline' do
-        .control-group
+        .form-group
           = label_tag :name, 'Name:', class: 'control-label'
-          .controls
+          .col-sm-10
             = text_field_tag :name, params[:name], class: "span2"
 
-        .control-group
+        .form-group
           = label_tag :owner_id, 'Owner:', class: 'control-label'
-          .controls
+          .col-sm-10
             = users_select_tag :owner_id, selected: params[:owner_id], class: 'input-large input-clamp'
-        .control-group.visibility-levels
+        .form-group.visibility-levels
           = label_tag :visibility_level, 'Visibility Levels', class: 'control-label'
           - Project.visibility_levels.each do |label, level|
-            .controls
+            .col-sm-10
               = check_box_tag 'visibility_levels[]', level, params[:visibility_levels].present? && params[:visibility_levels].include?(level.to_s)
               %span.descr
                 = visibility_level_icon(level)
                 = label
-        .control-group
+        .form-group
           = label_tag :with_push, 'Not empty', class: 'control-label'
-          .controls
+          .col-sm-10
             = check_box_tag :with_push, 1, params[:with_push]
              
             %span.light Projects with push events
-        .control-group
+        .form-group
           = label_tag :abandoned, 'Abandoned', class: 'control-label'
-          .controls
+          .col-sm-10
             = check_box_tag :abandoned, 1, params[:abandoned]
              
             %span.light No activity over 6 month
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 0a90655cd24..786482eee2e 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -80,13 +80,13 @@
         Transfer project
       .body
         = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
-          .control-group
+          .form-group
             = f.label :namespace_id, "Namespace"
-            .controls
+            .col-sm-10
               = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
 
-          .control-group
-            .controls
+          .form-group
+            .col-sm-10
               = f.submit 'Transfer', class: 'btn btn-primary'
 
   .col-md-6
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 6e3b7337ab3..fc9b2d250a5 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -8,28 +8,28 @@
 
     %fieldset
       %legend Account
-      .control-group
+      .form-group
         = f.label :name
-        .controls
+        .col-sm-10
           = f.text_field :name, required: true, autocomplete: "off"
           %span.help-inline * required
-      .control-group
+      .form-group
         = f.label :username
-        .controls
+        .col-sm-10
           = f.text_field :username, required: true, autocomplete: "off"
           %span.help-inline * required
-      .control-group
+      .form-group
         = f.label :email
-        .controls
+        .col-sm-10
           = f.text_field :email, required: true, autocomplete: "off"
           %span.help-inline * required
 
     - if @user.new_record?
       %fieldset
         %legend Password
-        .control-group
+        .form-group
           = f.label :password
-          .controls
+          .col-sm-10
             %strong
               A temporary password will be generated and sent to user.
               %br
@@ -37,29 +37,29 @@
     - else
       %fieldset
         %legend Password
-        .control-group
+        .form-group
           = f.label :password
-          .controls= f.password_field :password, disabled: f.object.force_random_password
-        .control-group
+          .col-sm-10= f.password_field :password, disabled: f.object.force_random_password
+        .form-group
           = f.label :password_confirmation
-          .controls= f.password_field :password_confirmation, disabled: f.object.force_random_password
+          .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password
 
     %fieldset
       %legend Access
       .row
         .col-md-8
-          .control-group
+          .form-group
             = f.label :projects_limit
-            .controls= f.number_field :projects_limit
+            .col-sm-10= f.number_field :projects_limit
 
-          .control-group
+          .form-group
             = f.label :can_create_group
-            .controls= f.check_box :can_create_group
+            .col-sm-10= f.check_box :can_create_group
 
-          .control-group
+          .form-group
             = f.label :admin do
               %strong.cred Administrator
-            .controls= f.check_box :admin
+            .col-sm-10= f.check_box :admin
         .col-md-4
           - unless @user.new_record?
             .alert.alert-error
@@ -71,15 +71,15 @@
                 = link_to 'Block User', block_admin_user_path(@user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
     %fieldset
       %legend Profile
-      .control-group
+      .form-group
         = f.label :skype
-        .controls= f.text_field :skype
-      .control-group
+        .col-sm-10= f.text_field :skype
+      .form-group
         = f.label :linkedin
-        .controls= f.text_field :linkedin
-      .control-group
+        .col-sm-10= f.text_field :linkedin
+      .form-group
         = f.label :twitter
-        .controls= f.text_field :twitter
+        .col-sm-10= f.text_field :twitter
 
     .form-actions
       - if @user.new_record?
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index 234392c03e1..312a29b1e36 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -6,14 +6,14 @@
       group
 
     %p 1. Choose users you want in the group
-    .control-group
+    .form-group
       = f.label :user_ids, "People"
-      .controls= users_select_tag(:user_ids, multiple: true, class: 'input-large')
+      .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
 
     %p 2. Set access level for them
-    .control-group
+    .form-group
       = f.label :group_access, "Group Access"
-      .controls= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
+      .col-sm-10= 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"
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 4008624a641..7bd275ead0e 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -24,15 +24,15 @@
               - if @group.errors.any?
                 .alert.alert-error
                   %span= @group.errors.full_messages.first
-              .control-group
+              .form-group
                 = f.label :name do
                   Group name
-                .controls
+                .col-sm-10
                   = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
 
-              .control-group.group-description-holder
+              .form-group.group-description-holder
                 = f.label :description, "Details"
-                .controls
+                .col-sm-10
                   = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
 
               .form-actions
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index d6d514e9b18..d9b7843cb33 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -2,19 +2,19 @@
   - if @group.errors.any?
     .alert.alert-error
       %span= @group.errors.full_messages.first
-  .control-group
+  .form-group
     = f.label :name do
       Group name
-    .controls
+    .col-sm-10
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
 
-  .control-group.group-description-holder
+  .form-group.group-description-holder
     = f.label :description, "Details"
-    .controls
+    .col-sm-10
       = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
 
-  .control-group
-    .controls
+  .form-group
+    .col-sm-10
       %ul
         %li A group is a collection of several projects
         %li Groups are private by default
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index 158979c0ee5..671fd0dfd4e 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -6,12 +6,12 @@
           - @key.errors.full_messages.each do |msg|
             %li= msg
 
-    .control-group
+    .form-group
       = f.label :title
-      .controls= f.text_field :title, class: "input-xlarge"
-    .control-group
+      .col-sm-10= f.text_field :title, class: "input-xlarge"
+    .form-group
       = f.label :key
-      .controls
+      .col-sm-10
         %p.light
           Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_ssh_path}.
         = f.text_area :key, class: "input-xxlarge thin_area"
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index a5fa6e7f186..e5fc5003843 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -14,19 +14,19 @@
           %ul
             - @user.errors.full_messages.each do |msg|
               %li= msg
-      .control-group
+      .form-group
         = f.label :current_password
-        .controls
+        .col-sm-10
           = f.password_field :current_password, required: true
           %div
             = link_to "Forgot your password?", reset_profile_password_path, method: :put
 
-      .control-group
+      .form-group
         = f.label :password, 'New password'
-        .controls= f.password_field :password, required: true
-      .control-group
+        .col-sm-10= f.password_field :password, required: true
+      .form-group
         = f.label :password_confirmation
-        .controls
+        .col-sm-10
           = f.password_field :password_confirmation, required: true
       .form-actions
         = f.submit 'Save password', class: "btn btn-save"
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index a4e7dadd16a..fc2c85df9b9 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -10,13 +10,13 @@
           - @user.errors.full_messages.each do |msg|
             %li= msg
 
-    .control-group
+    .form-group
       = f.label :password
-      .controls= f.password_field :password, required: true
-    .control-group
+      .col-sm-10= f.password_field :password, required: true
+    .form-group
       = f.label :password_confirmation
-      .controls
+      .col-sm-10
         = f.password_field :password_confirmation, required: true
-    .control-group
-      .controls
+    .form-group
+      .col-sm-10
         = f.submit 'Set new password', class: "btn btn-create"
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 6984deba6b8..7ecb4e56bc6 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -16,15 +16,15 @@
           %li= msg
   .row
     .col-md-7
-      .control-group
+      .form-group
         = f.label :name, class: "control-label"
-        .controls
+        .col-sm-10
           = f.text_field :name, class: "input-xlarge", required: true
           %span.help-block Enter your name, so people you know can recognize you.
 
-      .control-group
+      .form-group
         = f.label :email, class: "control-label"
-        .controls
+        .col-sm-10
           - if @user.ldap_user?
             = f.text_field :email, class: "input-xlarge", required: true, readonly: true
             %span.help-block.light
@@ -37,18 +37,18 @@
                 %strong #{@user.unconfirmed_email}
             - else
               %span.help-block We also use email for avatar detection if no avatar is uploaded.
-      .control-group
+      .form-group
         = f.label :skype, class: "control-label"
-        .controls= f.text_field :skype, class: "input-xlarge"
-      .control-group
+        .col-sm-10= f.text_field :skype, class: "input-xlarge"
+      .form-group
         = f.label :linkedin, class: "control-label"
-        .controls= f.text_field :linkedin, class: "input-xlarge"
-      .control-group
+        .col-sm-10= f.text_field :linkedin, class: "input-xlarge"
+      .form-group
         = f.label :twitter, class: "control-label"
-        .controls= f.text_field :twitter, class: "input-xlarge"
-      .control-group
+        .col-sm-10= f.text_field :twitter, class: "input-xlarge"
+      .form-group
         = f.label :bio, class: "control-label"
-        .controls
+        .col-sm-10
           = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
           %span.help-block Tell us about yourself in fewer than 250 characters.
 
diff --git a/app/views/projects/_visibility_level.html.haml b/app/views/projects/_visibility_level.html.haml
index 7fc257811ca..31f45e6ab66 100644
--- a/app/views/projects/_visibility_level.html.haml
+++ b/app/views/projects/_visibility_level.html.haml
@@ -1,11 +1,11 @@
-.control-group.project-visibility-level-holder
+.form-group.project-visibility-level-holder
   = f.label :visibility_level do
     Visibility Level
     = link_to "(?)", help_public_access_path
   - if can_change_visibility_level
     - Gitlab::VisibilityLevel.values.each do |level|
       - restricted = restricted_visibility_levels.include?(level)
-      .controls
+      .col-sm-10
         = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
         %span.descr{:class => ("restricted" if restricted)}
           = label :project_visibility_level, level do
@@ -14,11 +14,11 @@
               = visibility_level_label(level)
           .light= visibility_level_description(level)
     - unless restricted_visibility_levels.empty?
-      .controls
+      .col-sm-10
         %span.info
           Some visibility level settings have been restricted by the administrator.
   - else
-    .controls
+    .col-sm-10
       %span.info
         = visibility_level_icon(visibility_level)
         %strong
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml
index 735863acd4f..582105a94a9 100644
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
@@ -8,12 +8,12 @@
 
   .modal-body
     = form_tag project_blob_path(@project, @id), method: :delete do
-      .control-group.commit_message-group
+      .form-group.commit_message-group
         = label_tag 'commit_message', class: "control-label" do
           Commit message
-        .controls
+        .col-sm-10
           = text_area_tag 'commit_message', params[:commit_message], placeholder: "Removed this file because...", required: true, rows: 3
-      .control-group
-        .controls
+      .form-group
+        .col-sm-10
           = submit_tag 'Remove file', class: 'btn btn-remove'
           = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index 37612d3fd7b..09b02789f0b 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -2,13 +2,13 @@
   %i.icon-code-fork
   New branch
 = form_tag project_branches_path, method: :post do
-  .control-group
+  .form-group
     = label_tag :branch_name, 'Name for new branch', class: 'control-label'
-    .controls
+    .col-sm-10
       = text_field_tag :branch_name, nil, placeholder: 'feature/dashboard', required: true, tabindex: 1
-  .control-group
+  .form-group
     = label_tag :ref, 'Create from', class: 'control-label'
-    .controls
+    .col-sm-10
       = text_field_tag :ref, nil, placeholder: 'master', required: true, tabindex: 2
       .light branch name or commit SHA
   .form-actions
diff --git a/app/views/projects/commits/_image.html.haml b/app/views/projects/commits/_image.html.haml
index d892a6819c4..5bb8af4613f 100644
--- a/app/views/projects/commits/_image.html.haml
+++ b/app/views/projects/commits/_image.html.haml
@@ -49,7 +49,7 @@
           %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
         .frame.added
           %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        .controls
+        .col-sm-10
           .transparent
           .drag-track
             .dragger{:style => "left: 0px;"}
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index ca1ea4073e6..605b2a8428b 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -4,11 +4,11 @@
       - if params[:to] && params[:from]
         = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
       .input-prepend
-        %span.add-on.input-xpadding from
+        %span.add-on from
         = text_field_tag :from, params[:from], class: "span3 input-xpadding"
       = "..."
       .input-prepend
-        %span.add-on.input-xpadding to
+        %span.add-on to
         = text_field_tag :to, params[:to], class: "span3 input-xpadding"
     .pull-left
        
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index d49b2204537..388e297255d 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -6,12 +6,12 @@
           - @key.errors.full_messages.each do |msg|
             %li= msg
 
-    .control-group
+    .form-group
       = f.label :title
-      .controls= f.text_field :title, class: 'input-xlarge'
-    .control-group
+      .col-sm-10= f.text_field :title, class: 'input-xlarge'
+    .form-group
       = f.label :key
-      .controls
+      .col-sm-10
         %p.light
           Paste a machine public key here. Read more about how to generate it
           = link_to "here", help_ssh_path
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 458ec1f86d6..4d365d0af48 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -9,24 +9,24 @@
       .form-holder
         = form_for(@project, remote: true) do |f|
           %fieldset
-            .control-group.project_name_holder
+            .form-group.project_name_holder
               = f.label :name do
                 Project name
-              .controls
+              .col-sm-10
                 = f.text_field :name, placeholder: "Example Project", class: "span5"
 
 
-            .control-group
+            .form-group
               = f.label :description do
                 Project description
                 %span.light (optional)
-              .controls
+              .col-sm-10
                 = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
 
             - if @project.repository.exists? && @project.repository.branch_names.any?
-              .control-group
+              .form-group
                 = f.label :default_branch, "Default Branch"
-                .controls= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
+                .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
 
 
           = render "visibility_level", f: f, visibility_level: @project.visibility_level, can_change_visibility_level: can?(current_user, :change_visibility_level, @project)
@@ -34,51 +34,51 @@
           %fieldset.features
             %legend
               Labels:
-            .control-group
+            .form-group
               = f.label :label_list, "Labels", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.text_field :label_list, maxlength: 2000, class: "span5"
                 %p.hint Separate labels with commas.
 
           %fieldset.features
             %legend
               Features:
-            .control-group
+            .form-group
               = f.label :issues_enabled, "Issues", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.check_box :issues_enabled
                 %span.descr Lightweight issue tracking system for this project
 
             - if Project.issues_tracker.values.count > 1
-              .control-group
+              .form-group
                 = f.label :issues_tracker, "Issues tracker", class: 'control-label'
-                .controls= f.select(:issues_tracker, project_issues_trackers(@project.issues_tracker), {}, { disabled: !@project.issues_enabled })
+                .col-sm-10= f.select(:issues_tracker, project_issues_trackers(@project.issues_tracker), {}, { disabled: !@project.issues_enabled })
 
-              .control-group
+              .form-group
                 = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
-                .controls= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
+                .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
 
-            .control-group
+            .form-group
               = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.check_box :merge_requests_enabled
                 %span.descr Submit changes to be merged upstream.
 
-            .control-group
+            .form-group
               = f.label :wiki_enabled, "Wiki", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.check_box :wiki_enabled
                 %span.descr Pages for project documentation
 
-            .control-group
+            .form-group
               = f.label :wall_enabled, "Wall", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.check_box :wall_enabled
                 %span.descr Simple chat system for broadcasting inside project
 
-            .control-group
+            .form-group
               = f.label :snippets_enabled, "Snippets", class: 'control-label'
-              .controls
+              .col-sm-10
                 = f.check_box :snippets_enabled
                 %span.descr Share code pastes with others out of git repository
 
@@ -135,11 +135,11 @@
           .errors-holder
           .form-holder
             = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project' }) do |f|
-              .control-group
+              .form-group
                 = f.label :namespace_id do
                   %span Namespace
-                .controls
-                  .control-group
+                .col-sm-10
+                  .form-group
                     = f.select :namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace' }, { class: 'chosen' }
                   %ul
                     %li Be careful. Changing the project's namespace can have unintended side effects.
@@ -155,11 +155,11 @@
         .errors-holder
         .form-holder
           = form_for(@project) do |f|
-            .control-group
+            .form-group
               = f.label :path do
                 %span Path
-              .controls
-                .control-group
+              .col-sm-10
+                .form-group
                   .input-append
                     = f.text_field :path
                     %span.add-on .git
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 9bb3eefe0cf..d141026d65b 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -15,10 +15,10 @@
       .file-content.code
         %pre#editor= @blob.data
 
-    .control-group.commit_message-group
+    .form-group.commit_message-group
       = label_tag 'commit_message', class: "control-label" do
         Commit message
-      .controls
+      .col-sm-10
         = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 2ac67140bd7..5df557add4f 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -12,15 +12,15 @@
     .alert.alert-error
       - @hook.errors.full_messages.each do |msg|
         %p= msg
-  .control-group
+  .form-group
     = f.label :url, "URL"
-    .controls
+    .col-sm-10
       = f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
        
       = f.submit "Add Web Hook", class: "btn btn-create"
-  .control-group
+  .form-group
     = f.label :url, "Trigger"
-    .controls
+    .col-sm-10
       %div
         = f.check_box :push_events, class: 'pull-left'
         .prepend-left-20
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 80d1aac6d3e..be237ac245f 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -8,18 +8,18 @@
           %br
     .issue-box
       .title
-        .control-group
+        .form-group
           = f.label :title do
             %strong= "Subject *"
-          .controls
+          .col-sm-10
             = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
       .context
-        .control-group
+        .form-group
           .issue_assignee.pull-left
             = f.label :assignee_id do
               %i.icon-user
               Assign to
-            .controls
+            .col-sm-10
               .pull-left
                 = f.select(:assignee_id, assignee_options(@issue), { include_blank: "Select a user" }, {class: 'chosen'})
               .pull-right
@@ -29,20 +29,20 @@
             = f.label :milestone_id do
               %i.icon-time
               Milestone
-            .controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
+            .col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
 
       .description
-        .control-group
+        .form-group
           = f.label :label_list do
             %i.icon-tag
             Labels
-          .controls
+          .col-sm-10
             = f.text_field :label_list, maxlength: 2000, class: "input-xxlarge"
             %p.hint Separate labels with commas.
 
-        .control-group
+        .form-group
           = f.label :description, "Details"
-          .controls
+          .col-sm-10
             = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14
             %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
 
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 1e3a83a257e..a868e964eeb 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -30,24 +30,24 @@
 
   %hr
   .merge-request-form-info
-    .control-group
+    .form-group
       = f.label :title do
         %strong= "Title *"
-      .controls= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
-    .control-group
+      .col-sm-10= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
+    .form-group
       .left
         = f.label :assignee_id do
           %i.icon-user
           Assign to
-        .controls= f.select(:assignee_id, assignee_options(@merge_request), { include_blank: "Select user" }, {class: 'chosen span3'})
+        .col-sm-10= f.select(:assignee_id, assignee_options(@merge_request), { include_blank: "Select user" }, {class: 'chosen span3'})
       .left
         = f.label :milestone_id do
           %i.icon-time
           Milestone
-        .controls= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'chosen'})
-    .control-group
+        .col-sm-10= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'chosen'})
+    .form-group
       = f.label :description, "Description"
-      .controls
+      .col-sm-10
         = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14
         %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
 
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index ac99a0e3796..34f6ca8a4a3 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -13,21 +13,21 @@
           %li= msg
   .row
     .col-md-6
-      .control-group
+      .form-group
         = f.label :title, "Title", class: "control-label"
-        .controls
+        .col-sm-10
           = f.text_field :title, maxlength: 255, class: "input-xlarge"
           %p.hint Required
-      .control-group
+      .form-group
         = f.label :description, "Description", class: "control-label"
-        .controls
+        .col-sm-10
           = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
           %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
     .col-md-6
-      .control-group
+      .form-group
         = f.label :due_date, "Due Date", class: "control-label"
-        .controls= f.hidden_field :due_date
-        .controls
+        .col-sm-10= f.hidden_field :due_date
+        .col-sm-10
           .datepicker
 
   .form-actions
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 2790ed6f594..2f16eaf3104 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -3,18 +3,18 @@
     = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
   .pull-left
     = form_tag project_network_path(@project, @id), method: :get do |f|
-      .control-group
+      .form-group
         = label_tag :filter_ref, "Begin with the selected commit", class: 'control-label light'
-        .controls
+        .col-sm-10
           = check_box_tag :filter_ref, 1, @options[:filter_ref]
     - @options.each do |key, value|
       = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
 
   .search.pull-right
     = form_tag project_network_path(@project, @id), method: :get do |f|
-      .control-group
+      .form-group
         = label_tag :search , "Looking for commit:", class: 'control-label light'
-        .controls
+        .col-sm-10
           = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-xlarge"
           = button_tag type: 'submit', class: 'btn vtop' do
             %i.icon-search
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 2b3eb2b81b4..85328a4599b 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -4,48 +4,48 @@
   .project-edit-content
 
     = form_for @project, remote: true do |f|
-      .control-group.project-name-holder
+      .form-group.project-name-holder
         = f.label :name do
           %strong Project name
-        .controls
+        .col-sm-10
           = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true
           %span.help-inline
             = link_to "#", class: 'js-toggle-visibility-link' do
               %span Customize repository name?
 
-      .control-group.js-toggle-visibility-container.gl-hide
+      .form-group.js-toggle-visibility-container.gl-hide
         = f.label :path do
           %span Repository name
-        .controls
+        .col-sm-10
           .input-append
             = f.text_field :path
             %span.add-on .git
 
 
       - if current_user.can_select_namespace?
-        .control-group
+        .form-group
           = f.label :namespace_id do
             %span Namespace
-          .controls
+          .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen', tabindex: 2}
 
-      .control-group
-        .controls
+      .form-group
+        .col-sm-10
           = link_to "#", class: 'appear-link' do
             %i.icon-upload-alt
             %span Import existing repository?
-      .control-group.appear-data.import-url-data
+      .form-group.appear-data.import-url-data
         = f.label :import_url do
           %span Import existing repo
-        .controls
+        .col-sm-10
           = f.text_field :import_url, class: 'input-xlarge', placeholder: 'https://github.com/randx/six.git'
           .light
             URL must be cloneable
-      .control-group
+      .form-group
         = f.label :description do
           Description
           %span.light (optional)
-        .controls
+        .col-sm-10
           = f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
       = render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
 
@@ -54,7 +54,7 @@
 
         - if current_user.can_create_group?
           .pull-right
-            .controls.light
+            .col-sm-10.light
               Need a group for several dependent projects?
               = link_to new_group_path, class: "btn btn-tiny" do
                 Create a group
diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml
index 327aac0d71a..68206d9b7be 100644
--- a/app/views/projects/new_tree/show.html.haml
+++ b/app/views/projects/new_tree/show.html.haml
@@ -2,10 +2,10 @@
 %hr
 .file-editor
   = form_tag(project_new_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .control-group.commit_message-group
+    .form-group.commit_message-group
       = label_tag 'file_name', class: "control-label" do
         File name
-      .controls
+      .col-sm-10
         %span.monospace= @path[-1] == "/" ? @path : @path + "/"
          
         = text_field_tag 'file_name', params[:file_name], placeholder: "sample.rb", required: true
@@ -14,10 +14,10 @@
           on
           %span.label-branch= @ref
 
-    .control-group.commit_message-group
+    .form-group.commit_message-group
       = label_tag 'commit_message', class: "control-label" do
         Commit message
-      .controls
+      .col-sm-10
         = text_area_tag 'commit_message', params[:commit_message], placeholder: "Added new file", required: true, rows: 3
 
     .file-holder
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 34ba55fc4cd..f848f500f33 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -18,9 +18,9 @@
           %li= msg
 
 
-  .control-group
+  .form-group
     = f.label :active, "Active", class: "control-label"
-    .controls
+    .col-sm-10
       = f.check_box :active
 
   - @service.fields.each do |field|
@@ -28,9 +28,9 @@
     - type = field[:type]
     - placeholder = field[:placeholder]
 
-    .control-group
+    .form-group
       = f.label name, class: "control-label"
-      .controls
+      .col-sm-10
         - if type == 'text'
           = f.text_field name, class: "input-xlarge", placeholder: placeholder
         - elsif type == 'textarea'
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index 198ec2170c7..62dd43a1e40 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -9,16 +9,16 @@
           - @snippet.errors.full_messages.each do |msg|
             %li= msg
 
-    .control-group
+    .form-group
       = f.label :title
-      .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
-    .control-group
+      .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
+    .form-group
       = f.label "Lifetime"
-      .controls= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
-    .control-group
+      .col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
+    .form-group
       .file-editor
         = f.label :file_name, "File"
-        .controls
+        .col-sm-10
           .file-holder.snippet
             .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 67030785e06..73e1c4ff1c2 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -2,13 +2,13 @@
   %i.icon-code-fork
   New tag
 = form_tag project_tags_path, method: :post do
-  .control-group
+  .form-group
     = label_tag :tag_name, 'Name for new tag', class: 'control-label'
-    .controls
+    .col-sm-10
       = text_field_tag :tag_name, nil, placeholder: 'v3.0.1', required: true, tabindex: 1
-  .control-group
+  .form-group
     = label_tag :ref, 'Create from', class: 'control-label'
-    .controls
+    .col-sm-10
       = text_field_tag :ref, nil, placeholder: 'master', required: true, tabindex: 2
       .light Branch name or commit SHA
   .form-actions
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 5214a54e909..f7f609e5452 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -9,15 +9,15 @@
           %li= msg
 
   %p 1. Choose people you want in the project
-  .control-group
+  .form-group
     = f.label :user_ids, "People"
-    .controls
+    .col-sm-10
       = users_select_tag(:user_ids, multiple: true)
 
   %p 2. Set access level for them
-  .control-group
+  .form-group
     = f.label :project_access, "Project Access"
-    .controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
+    .col-sm-10= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
 
   .form-actions
     = f.submit 'Add users', class: "btn btn-create"
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index 1d98b986210..953fce66ead 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -6,7 +6,7 @@
 = form_tag apply_import_project_team_members_path(@project), method: 'post' do
   .padded
     = label_tag :source_project_id, "Project"
-    .controls= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
+    .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
 
   .form-actions
     = submit_tag 'Import project members', class: "btn btn-create"
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 0420e026c69..1d97479dc48 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -14,7 +14,7 @@
         = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
         = f.label :format, class: "pull-right", style: "padding-right: 20px;"
     .context
-      .controls
+      .col-sm-10
         %span.cgray
           Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
           To link to a (new) page you can just type
@@ -22,13 +22,13 @@
           \.
 
     .description
-      .control-group
+      .form-group
         = f.label :content
-        .controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
+        .col-sm-10= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
     .description
-      .control-group
+      .form-group
         = f.label :commit_message
-        .controls= f.text_field :message, class: 'span8', rows: 18
+        .col-sm-10= f.text_field :message, class: 'span8', rows: 18
   .form-actions
     - if @wiki && @wiki.persisted?
       = f.submit 'Save changes', class: "btn-save btn"
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 25e8c00888a..0e397df5418 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -2,7 +2,7 @@
   .search-holder
     = label_tag :search do
       %span Looking for
-    .controls
+    .col-sm-10
       = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
       = hidden_field_tag :project_id, params[:project_id]
       = hidden_field_tag :group_id, params[:group_id]
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 0541ed4d633..2ec22291d45 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -9,12 +9,12 @@
           - @snippet.errors.full_messages.each do |msg|
             %li= msg
 
-    .control-group
+    .form-group
       = f.label :title
-      .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
-    .control-group
+      .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
+    .form-group
       = f.label "Access"
-      .controls
+      .col-sm-10
         = f.label :private_true, class: 'radio-label' do
           = f.radio_button :private, true
           %span
@@ -27,10 +27,10 @@
             %strong Public
             (GitLab users can see this snippet)
 
-    .control-group
+    .form-group
       .file-editor
         = f.label :file_name, "File"
-        .controls
+        .col-sm-10
           .file-holder.snippet
             .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true