Merge branch 'yo-gl-button-promotion' into 'master'

Add `gl-button` to promotion buttons on issue sidebar

See merge request gitlab-org/gitlab!51287

changelogs/unreleased/yo-gl-button-promotion.yml

+---
+title: Add `gl-button` to promotion buttons on issue sidebar
+merge_request: 51287
+author: Yogi (@yo)
+type: other

ee/app/views/shared/promotions/_promote_epics.html.haml

@@ -20,9 +20,9 @@
           %p
             = s_('Promotions|Epics let you manage your portfolio of projects more efficiently and with less effort by tracking groups of issues that share a theme, across projects and milestones.')
             = link_to s_('Read more'), 'https://docs.gitlab.com/ee/user/group/epics/', class: 'btn-link', target: '_blank'
-          .gl-display-flex.gl-flex-wrap
+          .gl-flex-wrap
             = render 'shared/promotions/promotion_link_project', short_form: true
-            = link_to s_("Promotions|Don't show me this again"), '#', class: 'btn js-close js-close-callout gl-mt-2'
+            = link_to s_("Promotions|Don't show me this again"), '#', class: 'gl-button btn js-close js-close-callout gl-mt-2'
 
     .hide-collapsed
       = s_('Promotions|This feature is locked.')

ee/app/views/shared/promotions/_promote_issue_weights.html.haml

@@ -35,6 +35,6 @@
           %div
             = render 'shared/promotions/promotion_link_project', short_form: true, target_blank: !trial_cta, trial_cta: trial_cta
             - if session_dismissal
-              = link_to s_("Promotions|Not now, thanks!"), '#', class: ['btn', 'js-close', 'js-close-callout', 'gl-mt-3', 'js-close-session', 'tr-issue-weights-not-now-cta'], data: { track_event: 'click_notnow' }.merge(tracking_options)
+              = link_to s_("Promotions|Not now, thanks!"), '#', class: ['gl-button', 'btn', 'js-close', 'js-close-callout', 'gl-mt-3', 'js-close-session', 'tr-issue-weights-not-now-cta'], data: { track_event: 'click_notnow' }.merge(tracking_options)
             - else
-              = link_to s_("Promotions|Don't show me this again"), '#', class: ['btn', 'js-close', 'js-close-callout', 'gl-mt-3', 'tr-issue-weights-dont-show-me-again'], data: { track_event: 'click_dontshow' }.merge(tracking_options)
+              = link_to s_("Promotions|Don't show me this again"), '#', class: ['gl-button', 'btn', 'js-close', 'js-close-callout', 'gl-mt-3', 'tr-issue-weights-dont-show-me-again'], data: { track_event: 'click_dontshow' }.merge(tracking_options)

ee/app/views/shared/promotions/_promotion_link_project.html.haml

@@ -20,6 +20,6 @@
   - if License.current&.expired?
     = link_to (!short_form ? s_('Promotions|Buy GitLab Enterprise Edition') : s_('Promotions|Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'
   - else
-    = link_to s_('Promotions|Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary btn-block'
+    = link_to s_('Promotions|Start GitLab Ultimate trial'), new_trial_url, class: 'gl-button btn btn-confirm gl-mb-3'
 - else
   %p= s_('Promotions|Contact your Administrator to upgrade your license.')