[skip ci] add col-sm-* for form-horizontal changes to keep layout

30 files changed, 79 insertions, 79 deletions

diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml
index cfa38fb4262..278ad210543 100644
--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
@@ -7,12 +7,12 @@
 
   = f.hidden_field :user_id
   .form-group.row
-    = f.label :user_id, class: 'col-form-label'
+    = f.label :user_id, class: 'col-sm-2 col-form-label'
     .col-sm-10
       - name = "#{@abuse_report.user.name} (@#{@abuse_report.user.username})"
       = text_field_tag :user_name, name, class: "form-control", readonly: true
   .form-group.row
-    = f.label :message, class: 'col-form-label'
+    = f.label :message, class: 'col-sm-2 col-form-label'
     .col-sm-10
       = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url)
       .form-text.text-muted
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 35e8224e7cf..5e08837255f 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -5,7 +5,7 @@
     %legend
       Navigation bar:
   .form-group.row
-    = f.label :header_logo, 'Header logo', class: 'col-form-label'
+    = f.label :header_logo, 'Header logo', class: 'col-sm-2 col-form-label'
     .col-sm-10
       - if @appearance.header_logo?
         = image_tag @appearance.header_logo_url, class: 'appearance-light-logo-preview'
@@ -22,17 +22,17 @@
     %legend
       Sign in/Sign up pages:
   .form-group.row
-    = f.label :title, class: 'col-form-label'
+    = f.label :title, class: 'col-sm-2 col-form-label'
     .col-sm-10
       = f.text_field :title, class: "form-control"
   .form-group.row
-    = f.label :description, class: 'col-form-label'
+    = f.label :description, class: 'col-sm-2 col-form-label'
     .col-sm-10
       = f.text_area :description, class: "form-control", rows: 10
       .hint
         Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
   .form-group.row
-    = f.label :logo, class: 'col-form-label'
+    = f.label :logo, class: 'col-sm-2 col-form-label'
     .col-sm-10
       - if @appearance.logo?
         = image_tag @appearance.logo_url, class: 'appearance-logo-preview'
@@ -49,7 +49,7 @@
     %legend
       New project pages:
   .form-group.row
-    = f.label :new_project_guidelines, class: 'col-form-label'
+    = f.label :new_project_guidelines, class: 'col-sm-2 col-form-label'
     .col-sm-10
       = f.text_area :new_project_guidelines, class: "form-control", rows: 10
       .hint
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index d558161ec8f..ff1e4d5610f 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -10,7 +10,7 @@
   = form_errors(@broadcast_message)
 
   .form-group.row
-    = f.label :message, class: 'col-form-label'
+    = f.label :message, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_area :message, class: "form-control js-autosize",
         required: true,
@@ -19,19 +19,19 @@
     .col-sm-10.col-sm-offset-2
       = link_to 'Customize colors', '#', class: 'js-toggle-colors-link'
   .form-group.row.js-toggle-colors-container.d-none
-    = f.label :color, "Background Color", class: 'col-form-label'
+    = f.label :color, "Background Color", class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.color_field :color, class: "form-control"
   .form-group.row.js-toggle-colors-container.d-none
-    = f.label :font, "Font Color", class: 'col-form-label'
+    = f.label :font, "Font Color", class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.color_field :font, class: "form-control"
   .form-group.row
-    = f.label :starts_at, class: 'col-form-label'
+    = f.label :starts_at, class: 'col-form-label col-sm-2'
     .col-sm-10.datetime-controls
       = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
   .form-group.row
-    = f.label :ends_at, class: 'col-form-label'
+    = f.label :ends_at, class: 'col-form-label col-sm-2'
     .col-sm-10.datetime-controls
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
   .form-actions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 6bc4333b60a..53d29416730 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -3,7 +3,7 @@
   = render 'shared/group_form', f: f
 
   .form-group.row.group-description-holder
-    = f.label :avatar, "Group avatar", class: 'col-form-label'
+    = f.label :avatar, "Group avatar", class: 'col-form-label col-sm-2'
     .col-sm-10
       = render 'shared/choose_group_avatar_button', f: f
 
diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml
index 12c6d43e654..231c0f70882 100644
--- a/app/views/admin/identities/_form.html.haml
+++ b/app/views/admin/identities/_form.html.haml
@@ -2,12 +2,12 @@
   = form_errors(@identity)
 
   .form-group.row
-    = f.label :provider, class: 'col-form-label'
+    = f.label :provider, class: 'col-form-label col-sm-2'
     .col-sm-10
       - values = Gitlab::Auth::OAuth::Provider.providers.map { |name| ["#{Gitlab::Auth::OAuth::Provider.label_for(name)} (#{name})", name] }
       = f.select :provider, values, { allow_blank: false }, class: 'form-control'
   .form-group.row
-    = f.label :extern_uid, "Identifier", class: 'col-form-label'
+    = f.label :extern_uid, "Identifier", class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :extern_uid, class: 'form-control', required: true
 
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml
index 4c8963f6443..ee51b44e83e 100644
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
@@ -2,15 +2,15 @@
   = form_errors(@label)
 
   .form-group.row
-    = f.label :title, class: 'col-form-label'
+    = f.label :title, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :title, class: "form-control", required: true
   .form-group.row
-    = f.label :description, class: 'col-form-label'
+    = f.label :description, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :description, class: "form-control js-quick-submit"
   .form-group.row
-    = f.label :color, "Background color", class: 'col-form-label'
+    = f.label :color, "Background color", class: 'col-form-label col-sm-2'
     .col-sm-10
       .input-group
         .input-group-prepend
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index a363f94736f..f3adf7ed974 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -116,7 +116,7 @@
       .card-body
         = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
           .form-group.row
-            = f.label :new_namespace_id, "Namespace", class: 'col-form-label'
+            = f.label :new_namespace_id, "Namespace", class: 'col-form-label col-sm-2'
             .col-sm-10
               .dropdown
                 = dropdown_toggle('Search for Namespace', { toggle: 'dropdown', field_name: 'new_namespace_id' }, { toggle_class: 'js-namespace-select large' })
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 6daccc359e1..010cb2ac354 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -5,17 +5,17 @@
     %fieldset
       %legend Account
       .form-group.row
-        = f.label :name, class: 'col-form-label'
+        = f.label :name, class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control'
           %span.help-inline * required
       .form-group.row
-        = f.label :username, class: 'col-form-label'
+        = f.label :username, class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control'
           %span.help-inline * required
       .form-group.row
-        = f.label :email, class: 'col-form-label'
+        = f.label :email, class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control'
           %span.help-inline * required
@@ -24,7 +24,7 @@
       %fieldset
         %legend Password
         .form-group.row
-          = f.label :password, class: 'col-form-label'
+          = f.label :password, class: 'col-form-label col-sm-2'
           .col-sm-10
             %strong
               Reset link will be generated and sent to the user.
@@ -34,10 +34,10 @@
       %fieldset
         %legend Password
         .form-group.row
-          = f.label :password, class: 'col-form-label'
+          = f.label :password, class: 'col-form-label col-sm-2'
           .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control'
         .form-group.row
-          = f.label :password_confirmation, class: 'col-form-label'
+          = f.label :password_confirmation, class: 'col-form-label col-sm-2'
           .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control'
 
     = render partial: 'access_levels', locals: { f: f }
@@ -45,21 +45,21 @@
     %fieldset
       %legend Profile
       .form-group.row
-        = f.label :avatar, class: 'col-form-label'
+        = f.label :avatar, class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.file_field :avatar
 
       .form-group.row
-        = f.label :skype, class: 'col-form-label'
+        = f.label :skype, class: 'col-form-label col-sm-2'
         .col-sm-10= f.text_field :skype, class: 'form-control'
       .form-group.row
-        = f.label :linkedin, class: 'col-form-label'
+        = f.label :linkedin, class: 'col-form-label col-sm-2'
         .col-sm-10= f.text_field :linkedin, class: 'form-control'
       .form-group.row
         = f.label :twitter, class: 'col-form-label'
         .col-sm-10= f.text_field :twitter, class: 'form-control'
       .form-group.row
-        = f.label :website_url, 'Website', class: 'col-form-label'
+        = f.label :website_url, 'Website', class: 'col-form-label col-sm-2'
         .col-sm-10= f.text_field :website_url, class: 'form-control'
 
     .form-actions
diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml
index 7a136bc0e24..6d35457a0ec 100644
--- a/app/views/groups/milestones/_form.html.haml
+++ b/app/views/groups/milestones/_form.html.haml
@@ -4,11 +4,11 @@
 
     .col-md-6
       .form-group.row
-        = f.label :title, "Title", class: "col-form-label"
+        = f.label :title, "Title", class: "col-form-label col-sm-2"
         .col-sm-10
           = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
       .form-group.row.milestone-description
-        = f.label :description, "Description", class: "col-form-label"
+        = f.label :description, "Description", class: "col-form-label col-sm-2"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do
             = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index f750a1b0233..1addfe1f1ab 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -13,7 +13,7 @@
   = render 'shared/group_form', f: f, autofocus: true
 
   .form-group.row.group-description-holder
-    = f.label :avatar, "Group avatar", class: 'col-form-label'
+    = f.label :avatar, "Group avatar", class: 'col-form-label col-sm-2'
     .col-sm-10
       = render 'shared/choose_group_avatar_button', f: f
 
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index 2215903f53f..d5a37095365 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -11,15 +11,15 @@
     In the next steps, you'll be able to map users and select the projects
     you want to import.
   .form-group.row
-    = label_tag :uri, 'FogBugz URL', class: 'col-form-label'
+    = label_tag :uri, 'FogBugz URL', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control'
   .form-group.row
-    = label_tag :email, 'FogBugz Email', class: 'col-form-label'
+    = label_tag :email, 'FogBugz Email', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :email, nil, class: 'form-control'
   .form-group.row
-    = label_tag :password, 'FogBugz Password', class: 'col-form-label'
+    = label_tag :password, 'FogBugz Password', class: 'col-form-label col-sm-8'
     .col-sm-4
       = password_field_tag :password, nil, class: 'form-control'
   .form-actions
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index a21e1dd118a..eb9790c7903 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -12,11 +12,11 @@
 
 = form_tag personal_access_token_import_gitea_path do
   .form-group.row
-    = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label'
+    = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
   .form-group.row
-    = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label'
+    = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :personal_access_token, nil, class: 'form-control'
   .form-actions
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index 11c70862aef..2176d7f8a31 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -12,13 +12,13 @@
 
   - unless @user.password_automatically_set?
     .form-group.row
-      = f.label :current_password, class: 'col-form-label'
+      = f.label :current_password, class: 'col-form-label col-sm-2'
       .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
   .form-group.row
-    = f.label :password, class: 'col-form-label'
+    = f.label :password, class: 'col-form-label col-sm-2'
     .col-sm-10= f.password_field :password, required: true, class: 'form-control'
   .form-group.row
-    = f.label :password_confirmation, class: 'col-form-label'
+    = f.label :password_confirmation, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.password_field :password_confirmation, required: true, class: 'form-control'
   .form-actions
diff --git a/app/views/projects/blob/_new_dir.html.haml b/app/views/projects/blob/_new_dir.html.haml
index 831dba0e4c9..e7a4e3d67cb 100644
--- a/app/views/projects/blob/_new_dir.html.haml
+++ b/app/views/projects/blob/_new_dir.html.haml
@@ -7,7 +7,7 @@
       .modal-body
         = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'js-create-dir-form js-quick-submit js-requires-input' do
           .form-group.row
-            = label_tag :dir_name, _('Directory name'), class: 'col-form-label'
+            = label_tag :dir_name, _('Directory name'), class: 'col-form-label col-sm-2'
             .col-sm-10
               = text_field_tag :dir_name, params[:dir_name], required: true, class: 'form-control'
 
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index 40c1b3d8199..65b414c8af2 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -11,12 +11,12 @@
 
 = form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "js-create-branch-form js-requires-input" do
   .form-group.row
-    = label_tag :branch_name, nil, class: 'col-form-label'
+    = label_tag :branch_name, nil, class: 'col-form-label col-sm-2'
     .col-sm-10
       = text_field_tag :branch_name, params[:branch_name], required: true, autofocus: true, class: 'form-control js-branch-name'
       .form-text.text-muted.text-danger.js-branch-name-error
   .form-group.row
-    = label_tag :ref, 'Create from', class: 'col-form-label'
+    = label_tag :ref, 'Create from', class: 'col-form-label col-sm-2'
     .col-sm-10.create-from
       .dropdown
         = hidden_field_tag :ref, default_ref
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index 4cec612ab1c..430bc8f59f9 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -22,7 +22,7 @@
           %p.append-bottom-20= description
         = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do
           .form-group.row.branch
-            = label_tag 'start_branch', branch_label, class: 'col-form-label'
+            = label_tag 'start_branch', branch_label, class: 'col-form-label col-sm-2'
             .col-sm-10
               = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
               = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 41a82971a2a..4cc59718715 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -3,11 +3,11 @@
   .row
     .col-md-6
       .form-group.row
-        = f.label :title, "Title", class: "col-form-label"
+        = f.label :title, "Title", class: "col-form-label col-sm-2"
         .col-sm-10
           = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
       .form-group.row.milestone-description
-        = f.label :description, "Description", class: "col-form-label"
+        = f.label :description, "Description", class: "col-form-label col-sm-2"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do
             = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...'
diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml
index 3b0ff81b58f..0d848f7899c 100644
--- a/app/views/projects/pages_domains/_form.html.haml
+++ b/app/views/projects/pages_domains/_form.html.haml
@@ -5,21 +5,21 @@
         %p= msg
 
 .form-group.row
-  = f.label :domain, class: 'col-form-label' do
+  = f.label :domain, class: 'col-form-label col-sm-2' do
     Domain
   .col-sm-10
     = f.text_field :domain, required: true, autocomplete: 'off', class: 'form-control', disabled: @domain.persisted?
 
 - if Gitlab.config.pages.external_https
   .form-group.row
-    = f.label :certificate, class: 'col-form-label' do
+    = f.label :certificate, class: 'col-form-label col-sm-2' do
       Certificate (PEM)
     .col-sm-10
       = f.text_area :certificate, rows: 5, class: 'form-control'
       %span.help-inline Upload a certificate for your domain with all intermediates
 
   .form-group.row
-    = f.label :key, class: 'col-form-label' do
+    = f.label :key, class: 'col-form-label col-sm-2' do
       Key (PEM)
     .col-sm-10
       = f.text_area :key, rows: 5, class: 'form-control'
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 0c9d1c7a26f..bdb9ad84815 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -8,7 +8,7 @@
 = form_for @pipeline, as: :pipeline, url: project_pipelines_path(@project), html: { id: "new-pipeline-form", class: "js-new-pipeline-form js-requires-input" } do |f|
   = form_errors(@pipeline)
   .form-group.row
-    = f.label :ref, 'Create for', class: 'col-form-label'
+    = f.label :ref, 'Create for', class: 'col-form-label col-sm-2'
     .col-sm-10
       = hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
       = dropdown_tag(params[:ref] || @project.default_branch,
diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml
index c9d850e392f..6a52e72bfd8 100644
--- a/app/views/projects/project_members/import.html.haml
+++ b/app/views/projects/project_members/import.html.haml
@@ -7,7 +7,7 @@
 %hr
 = form_tag apply_import_project_project_members_path(@project), method: 'post' do
   .form-group.row
-    = label_tag :source_project_id, "Project", class: 'col-form-label'
+    = label_tag :source_project_id, "Project", class: 'col-form-label col-sm-2'
     .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
 
   .form-actions
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index e44b4673557..e8bc7705a50 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -1,52 +1,52 @@
 = form_for runner, url: runner_form_url do |f|
   = form_errors(runner)
   .form-group.row
-    = label :active, "Active", class: 'col-form-label'
+    = label :active, "Active", class: 'col-form-label col-sm-2'
     .col-sm-10
       .form-check
         = f.check_box :active
         %span.light Paused Runners don't accept new jobs
   .form-group.row
-    = label :protected, "Protected", class: 'col-form-label'
+    = label :protected, "Protected", class: 'col-form-label col-sm-2'
     .col-sm-10
       .form-check
         = f.check_box :access_level, {}, 'ref_protected', 'not_protected'
         %span.light This runner will only run on pipelines triggered on protected branches
   .form-group.row
-    = label :run_untagged, 'Run untagged jobs', class: 'col-form-label'
+    = label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2'
     .col-sm-10
       .form-check
         = f.check_box :run_untagged
         %span.light Indicates whether this runner can pick jobs without tags
   .form-group.row
-    = label :locked, 'Lock to current projects', class: 'col-form-label'
+    = label :locked, 'Lock to current projects', class: 'col-form-label col-sm-2'
     .col-sm-10
       .form-check
         = f.check_box :locked
         %span.light When a runner is locked, it cannot be assigned to other projects
   .form-group.row
-    = label_tag :token, class: 'col-form-label' do
+    = label_tag :token, class: 'col-form-label col-sm-2' do
       Token
     .col-sm-10
       = f.text_field :token, class: 'form-control', readonly: true
   .form-group.row
-    = label_tag :ip_address, class: 'col-form-label' do
+    = label_tag :ip_address, class: 'col-form-label col-sm-2' do
       IP Address
     .col-sm-10
       = f.text_field :ip_address, class: 'form-control', readonly: true
   .form-group.row
-    = label_tag :description, class: 'col-form-label' do
+    = label_tag :description, class: 'col-form-label col-sm-2' do
       Description
     .col-sm-10
       = f.text_field :description, class: 'form-control'
   .form-group.row
-    = label_tag :maximum_timeout_human_readable, class: 'col-form-label' do
+    = label_tag :maximum_timeout_human_readable, class: 'col-form-label col-sm-2' do
       Maximum job timeout
     .col-sm-10
       = f.text_field :maximum_timeout_human_readable, class: 'form-control'
       .form-text.text-muted This timeout will take precedence when lower than Project-defined timeout
   .form-group.row
-    = label_tag :tag_list, class: 'col-form-label' do
+    = label_tag :tag_list, class: 'col-form-label col-sm-2' do
       Tags
     .col-sm-10
       = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index ea76e6f276f..b596748ca5f 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -12,11 +12,11 @@
 
 = form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "common-note-form tag-form js-quick-submit js-requires-input" do
   .form-group.row
-    = label_tag :tag_name, nil, class: 'col-form-label'
+    = label_tag :tag_name, nil, class: 'col-form-label col-sm-2'
     .col-sm-10
       = text_field_tag :tag_name, params[:tag_name], required: true, autofocus: true, class: 'form-control'
   .form-group.row
-    = label_tag :ref, 'Create from', class: 'col-form-label'
+    = label_tag :ref, 'Create from', class: 'col-form-label col-sm-2'
     .col-sm-10.create-from
       .dropdown
         = hidden_field_tag :ref, default_ref
@@ -26,14 +26,14 @@
       .form-text.text-muted
         = s_('TagsPage|Existing branch name, tag, or commit SHA')
   .form-group.row
-    = label_tag :message, nil, class: 'col-form-label'
+    = label_tag :message, nil, class: 'col-form-label col-sm-2'
     .col-sm-10
       = text_area_tag :message, @message, required: false, class: 'form-control', rows: 5
       .form-text.text-muted
         = s_('TagsPage|Optionally, add a message to the tag.')
   %hr
   .form-group.row
-    = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label'
+    = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label col-sm-2'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
         = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: s_('TagsPage|Write your release notes or drag files here...'), current_text: @release_description
diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index d6771993c32..0bc6b04aeba 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -1,7 +1,7 @@
 .form-group.row.commit_message-group
   - nonce = SecureRandom.hex
   - descriptions = local_assigns.slice(:message_with_description, :message_without_description)
-  = label_tag "commit_message-#{nonce}", class: 'col-form-label' do
+  = label_tag "commit_message-#{nonce}", class: 'col-form-label col-sm-2' do
     #{ _('Commit message') }
   .col-sm-10
     .commit-message-container
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml
index 5f7077daaec..81c33eeea4f 100644
--- a/app/views/shared/_new_commit_form.html.haml
+++ b/app/views/shared/_new_commit_form.html.haml
@@ -8,7 +8,7 @@
 - else
   - if can?(current_user, :push_code, @project)
     .form-group.row.branch
-      = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label'
+      = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label col-sm-2'
       .col-sm-10
         = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name"
 
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
index 41534e48101..091dd48c6fc 100644
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
@@ -9,13 +9,13 @@
 .service-settings
   - if @service.show_active_box?
     .form-group.row
-      = form.label :active, "Active", class: "col-form-label"
+      = form.label :active, "Active", class: "col-form-label col-sm-2"
       .col-sm-10
         = form.check_box :active, disabled: disable_fields_service?(@service)
 
   - if @service.configurable_events.present?
     .form-group.row
-      = form.label :url, "Trigger", class: 'col-form-label'
+      = form.label :url, "Trigger", class: 'col-form-label col-sm-2'
 
       .col-sm-10
         - @service.configurable_events.each do |event|
diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml
index ca3641c3cb9..38c6f560dc6 100644
--- a/app/views/shared/_visibility_level.html.haml
+++ b/app/views/shared/_visibility_level.html.haml
@@ -2,7 +2,7 @@
 
 .form-group.row.visibility-level-setting
   - if with_label
-    = f.label :visibility_level, class: 'col-form-label' do
+    = f.label :visibility_level, class: 'col-form-label col-sm-2' do
       Visibility Level
       = link_to icon('question-circle'), help_page_path("public_access/public_access")
   %div{ :class => ("col-sm-10" if with_label) }
diff --git a/app/views/shared/deploy_keys/_form.html.haml b/app/views/shared/deploy_keys/_form.html.haml
index e1eb1adb060..913c065e188 100644
--- a/app/views/shared/deploy_keys/_form.html.haml
+++ b/app/views/shared/deploy_keys/_form.html.haml
@@ -5,26 +5,26 @@
 = form_errors(deploy_key)
 
 .form-group
-  = form.label :title, class: 'col-form-label'
+  = form.label :title, class: 'col-form-label col-sm-2'
   .col-sm-10= form.text_field :title, class: 'form-control'
 
 .form-group
   - if deploy_key.new_record?
-    = form.label :key, class: 'col-form-label'
+    = form.label :key, class: 'col-form-label col-sm-2'
     .col-sm-10
       %p.light
         Paste a machine public key here. Read more about how to generate it
         = link_to 'here', help_page_path('ssh/README')
       = form.text_area :key, class: 'form-control thin_area', rows: 5
   - else
-    = form.label :fingerprint, class: 'col-form-label'
+    = form.label :fingerprint, class: 'col-form-label col-sm-2'
     .col-sm-10
       = form.text_field :fingerprint, class: 'form-control', readonly: 'readonly'
 
 - if deploy_keys_project.present?
   = form.fields_for :deploy_keys_projects, deploy_keys_project do |deploy_keys_project_form|
     .form-group
-      .col-form-label
+      .col-form-label.col-sm-2
       .col-sm-10
         = deploy_keys_project_form.label :can_push do
           = deploy_keys_project_form.check_box :can_push
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml
index 11c2f83152c..e5dfa7dbf71 100644
--- a/app/views/shared/form_elements/_description.html.haml
+++ b/app/views/shared/form_elements/_description.html.haml
@@ -10,7 +10,7 @@
   - preview_url = preview_markdown_path(project)
 
 .form-group.row.detail-page-description
-  = form.label :description, 'Description', class: 'col-form-label'
+  = form.label :description, 'Description', class: 'col-form-label col-sm-2'
   .col-sm-10
 
     = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 19ec7bf2246..f79f66b144f 100644
--- a/app/views/shared/labels/_form.html.haml
+++ b/app/views/shared/labels/_form.html.haml
@@ -2,15 +2,15 @@
   = form_errors(@label)
 
   .form-group.row
-    = f.label :title, class: 'col-form-label'
+    = f.label :title, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :title, class: "form-control", required: true, autofocus: true
   .form-group.row
-    = f.label :description, class: 'col-form-label'
+    = f.label :description, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :description, class: "form-control js-quick-submit"
   .form-group.row
-    = f.label :color, "Background color", class: 'col-form-label'
+    = f.label :color, "Background color", class: 'col-form-label col-sm-2'
     .col-sm-10
       .input-group
         .input-group-prepend
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index 81de693c79d..858adc8be37 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -6,7 +6,7 @@
     = form_errors(@snippet)
 
     .form-group.row
-      = f.label :title, class: 'col-form-label'
+      = f.label :title, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :title, class: 'form-control', required: true, autofocus: true
 
@@ -16,7 +16,7 @@
 
     .file-editor
       .form-group.row
-        = f.label :file_name, "File", class: 'col-form-label'
+        = f.label :file_name, "File", class: 'col-form-label col-sm-2'
         .col-sm-10
           .file-holder.snippet
             .js-file-title.file-title