Add latest changes from gitlab-org/gitlab@master

1 files changed, 41 insertions, 40 deletions

diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 049f3d61294..097329a027c 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -3,45 +3,46 @@
 .gl-mt-3
 .row
   .col-sm
-    .bg-light.info-well.p-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('pod', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('CPU')
-      .data
-        - if @cpus
-          %h2= _('%{cores} cores') % { cores: @cpus.length }
-        - else
-          = sprite_icon('warning-solid', css_class: 'text-warning')
-          = _('Unable to collect CPU info')
-    .bg-light.info-well.p-3.gl-mt-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('status-health', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Memory Usage')
-      .data
-        - if @memory
-          %h2 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
-        - else
-          = sprite_icon('warning-solid', css_class: 'text-warning')
-          = _('Unable to collect memory info')
-    .bg-light.info-well.p-3.gl-mt-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('clock', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('System started')
-      .data
-        %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('pod', size: 18, css_class: 'gl-text-gray-700')
+          = s_('CPU')
+        .data
+          - if @cpus
+            %h2= _('%{cores} cores') % { cores: @cpus.length }
+          - else
+            = sprite_icon('warning-solid', css_class: 'text-warning')
+            = _('Unable to collect CPU info')
+
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('status-health', size: 18, css_class: 'gl-text-gray-700')
+          = s_('Memory Usage')
+        .data
+          - if @memory
+            %h2 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
+          - else
+            = sprite_icon('warning-solid', css_class: 'text-warning')
+            = _('Unable to collect memory info')
+
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('clock', size: 18, css_class: 'gl-text-gray-700')
+          = s_('System started')
+        .data
+          %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
   .col-sm
-    .bg-light.info-well.p-3
-      %h4.page-title.d-flex
-        .gl-display-flex.gl-align-items-center.gl-justify-content-center
-          = sprite_icon('disk', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Disk Usage')
-      .data
-        %ul
+    = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c|
+      = c.body do
+        %h4
+          = sprite_icon('disk', size: 18, css_class: 'gl-text-gray-700')
+          = s_('Disk Usage')
+        .data
           - @disks.each do |disk|
-            %li
-              %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
-              %p= disk[:disk_name]
-              %p= disk[:mount_path]
+            %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
+            %ul
+              %li= disk[:disk_name]
+              %li= disk[:mount_path]