Merge branch 'yo-gl-new-ui-admin-license' into 'master'

Apply new GitLab UI for buttons and card in admin/license

See merge request gitlab-org/gitlab!52408

changelogs/unreleased/yo-gl-new-ui-admin-license.yml

+---
+title: Apply new GitLab UI for buttons and card in admin/license
+merge_request: 52408
+author: Yogi (@yo)
+type: other

ee/app/views/admin/licenses/_info.html.haml

 .row
   .col-md-6
-    .card
-      .card-header
+    .gl-card.gl-mb-5
+      .gl-card-header
         = _('Licensed to')
-      %ul.content-list
-        - @license.licensee.each do |label, value|
-          %li
-            %span.light= succeed(':') { label }
-            %strong= value
+      .gl-card-body
+        %ul.content-list
+          - @license.licensee.each do |label, value|
+            %li
+              %span.light= succeed(':') { label }
+              %strong= value
 
-    .card.js-license-info-panel
-      .card-header
+    .gl-card.js-license-info-panel.gl-mb-5
+      .gl-card-header
         = _('Details')
-      %ul.content-list
-        %li
-          %span.light= _('Plan:')
-          %strong= @license.plan.capitalize
-          - unless @license.ultimate?
-            = ' - '
-            = link_to _('Contact Sales to upgrade'),
-              'https://about.gitlab.com/sales/?inapplink=contactsalessm',
-              class: 'inline-link',
-              target: :_blank,
-              rel: :noreferrer
-        %li
-          %span.light= _('Uploaded:')
-          %strong= time_ago_with_tooltip @license.created_at
-        %li
-          %span.light= _('Started:')
-          %strong= time_ago_with_tooltip @license.starts_at
-        %li
-          %span.light
-            = render 'license_status'
+      .gl-card-body
+        %ul.content-list
+          %li
+            %span.light= _('Plan:')
+            %strong= @license.plan.capitalize
+            - unless @license.ultimate?
+              = ' - '
+              = link_to _('Contact Sales to upgrade'),
+                'https://about.gitlab.com/sales/?inapplink=contactsalessm',
+                class: 'inline-link',
+                target: :_blank,
+                rel: :noreferrer
+          %li
+            %span.light= _('Uploaded:')
+            %strong= time_ago_with_tooltip @license.created_at
+          %li
+            %span.light= _('Started:')
+            %strong= time_ago_with_tooltip @license.starts_at
+          %li
+            %span.light
+              = render 'license_status'
 
-          - if @license.expired?
-            %span.badge.badge-danger.float-right
-              %strong= _('Expired')
-        %li
-          %span.light= _('License ID:')
-          %strong= @license.license_id
-          = clipboard_button(text: @license.license_id, title: _("Copy ID"), class: "btn-transparent btn-clipboard")
+            - if @license.expired?
+              %span.badge.badge-danger.float-right
+                %strong= _('Expired')
+          %li
+            %span.light= _('License ID:')
+            %strong= @license.license_id
+            = clipboard_button(text: @license.license_id, title: _("Copy ID"), class: "btn-transparent btn-clipboard")
 
 
   .col-md-6
-    .card.border-info
-      .card-header.bg-info.text-white
+    .gl-card.border-info.gl-mb-5
+      .gl-card-header.bg-info.text-white
         = _('Download license')
-      .card-body
+      .gl-card-body
         %p= html_escape(_('Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your %{code_open}.gitlab-license%{code_close} file.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
         %p= _('Still, we recommend keeping a backup saved somewhere. Otherwise, if you ever need it and have lost it, you will need to request GitLab Inc. to send it to you again.')
         %br
         = link_to _('Download license'), download_admin_license_path, class: 'gl-button btn btn-info'
         = link_to _('Customer Portal'), 'https://customers.gitlab.com', class: 'gl-button btn btn-info btn-inverted', data: { track_event: 'click_text', track_label: 'license_dashboard', track_property: 'customer_portal' }, target: '_blank', rel: 'noopener noreferrer'
 
-    .card.border-danger
-      .card-header.bg-danger.text-white
+    .gl-card.border-danger.gl-mb-5
+      .gl-card-header.bg-danger.text-white
         = _('Remove license')
-      .card-body
+      .gl-card-body
         %p= _('If you remove this license, GitLab will fall back on the previous license, if any.')
         %p= _('If there is no previous license or if the previous license has expired, some GitLab functionality will be blocked until a new, valid license is uploaded.')
         %br

ee/app/views/admin/licenses/_upload_buy_license.html.haml

 = link_to _('Buy License'), ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: 'gl-button btn btn-success btn-inverted float-right btn-buy-license'
-= link_to _('Upload New License'), new_admin_license_path, class: 'gl-button btn float-right btn-upload-license gl-mr-3', data: { qa_selector: 'license_upload_link' }
+= link_to _('Upload New License'), new_admin_license_path, class: 'gl-button btn btn-default float-right btn-upload-license gl-mr-3', data: { qa_selector: 'license_upload_link' }