Merge branch 'master' into ide-jobs-list-components

3 files changed, 29 insertions, 29 deletions

diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
index 302a543cf12..660123d8b07 100644
--- a/app/views/shared/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -1,56 +1,56 @@
-= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
+= form_for runner, url: runner_form_url do |f|
   = form_errors(runner)
-  .form-group
-    = label :active, "Active", class: 'control-label'
+  .form-group.row
+    = label :active, "Active", class: 'col-form-label col-sm-2'
     .col-sm-10
-      .checkbox
+      .form-check
         = f.check_box :active
         %span.light Paused Runners don't accept new jobs
-  .form-group
-    = label :protected, "Protected", class: 'control-label'
+  .form-group.row
+    = label :protected, "Protected", class: 'col-form-label col-sm-2'
     .col-sm-10
-      .checkbox
+      .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
-    = label :run_untagged, 'Run untagged jobs', class: 'control-label'
+  .form-group.row
+    = label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2'
     .col-sm-10
-      .checkbox
+      .form-check
         = f.check_box :run_untagged
         %span.light Indicates whether this runner can pick jobs without tags
   - unless runner.group_type?
-    .form-group
-      = label :locked, _('Lock to current projects'), class: 'control-label'
+    .form-group.row
+      = label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2'
       .col-sm-10
-        .checkbox
+        .form-check
           = f.check_box :locked
           %span.light= _('When a runner is locked, it cannot be assigned to other projects')
-  .form-group
-    = label_tag :token, class: 'control-label' do
+  .form-group.row
+    = 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
-    = label_tag :ip_address, class: 'control-label' do
+  .form-group.row
+    = 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
-    = label_tag :description, class: 'control-label' do
+  .form-group.row
+    = label_tag :description, class: 'col-form-label col-sm-2' do
       Description
     .col-sm-10
       = f.text_field :description, class: 'form-control'
-  .form-group
-    = label_tag :maximum_timeout_human_readable, class: 'control-label' do
+  .form-group.row
+    = 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'
-      .help-block This timeout will take precedence when lower than Project-defined timeout
-  .form-group
-    = label_tag :tag_list, class: 'control-label' do
+      .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 col-sm-2' do
       Tags
     .col-sm-10
       = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
-      .help-block You can setup jobs to only use Runners with specific tags. Separate tags with commas.
+      .form-text.text-muted You can setup jobs to only use Runners with specific tags. Separate tags with commas.
   .form-actions
     = f.submit 'Save changes', class: 'btn btn-save'
diff --git a/app/views/shared/runners/_runner_description.html.haml b/app/views/shared/runners/_runner_description.html.haml
index 1d59c2f7078..da5c032add5 100644
--- a/app/views/shared/runners/_runner_description.html.haml
+++ b/app/views/shared/runners/_runner_description.html.haml
@@ -9,8 +9,8 @@
   %div
     %ul
       %li
-        %span.label.label-success active
+        %span.badge.badge-success active
         = _('- Runner is active and can process any new jobs')
       %li
-        %span.label.label-danger paused
+        %span.badge.badge-danger paused
         = _('- Runner is paused and will not receive any new jobs')
diff --git a/app/views/shared/runners/show.html.haml b/app/views/shared/runners/show.html.haml
index 93c6ba86640..e50b7fa68dd 100644
--- a/app/views/shared/runners/show.html.haml
+++ b/app/views/shared/runners/show.html.haml
@@ -2,7 +2,7 @@
 
 %h3.page-title
   Runner ##{@runner.id}
-  .pull-right
+  .float-right
     - if @runner.shared?
       %span.runner-state.runner-state-shared
         Shared
@@ -36,7 +36,7 @@
       %td Tags
       %td
         - @runner.tag_list.sort.each do |tag|
-          %span.label.label-primary
+          %span.badge.badge-primary
             = tag
     %tr
       %td Name