Merge branch 'services-ui' into 'master'

app/views/projects/services/_form.html.haml

-%h3.page-title
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
       = @service.title
       = boolean_to_icon @service.activated?
 
-%p= @service.description
-
-%hr
-
-= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
+    %p= @service.description
+  .col-lg-9
+    = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
       = render 'shared/service_settings', form: form
-
-  .form-actions
       = form.submit 'Save changes', class: 'btn btn-save'
        
       - if @service.valid? && @service.activated?

app/views/projects/services/index.html.haml

 - page_title "Services"
-%h3.page-title Project services
-%p.light Project services allow you to integrate GitLab with other applications
 
-.table-holder
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      Project services
+    %p Project services allow you to integrate GitLab with other applications
+  .col-lg-9
     %table.table
+      %colgroup
+        %col
+        %col
+        %col.hidden-xs
+        %col{ width: "120" }
       %thead
         %tr
           %th
           %th Service
-        %th Description
+          %th.hidden-xs Description
           %th Last edit
       - @services.sort_by(&:title).each do |service|
         %tr
@@ -17,7 +25,7 @@
           %td
             = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
               %strong= service.title
-        %td
+          %td.hidden-xs
             = service.description
           %td.light
             = time_ago_in_words service.updated_at