Merge branch '231181-apply-gitlab-ui-styles-1' into 'master'

Apply gl-button class to buttons See merge request gitlab-org/gitlab!47481

Merge branch '231181-apply-gitlab-ui-styles-1' into 'master'
Apply gl-button class to buttons See merge request gitlab-org/gitlab!47481
b4f062aa · Phil Hughes · 0a7ce52e · edb27535 · b4f062aa · b4f062aa
Commit b4f062aa authored Nov 17, 2020 by Phil Hughes
2 changed files
--- a/ee/app/views/admin/application_settings/_custom_templates_form.html.haml
+++ b/ee/app/views/admin/application_settings/_custom_templates_form.html.haml
@@ -3,7 +3,7 @@
    .settings-header
      %h4
        = _('Custom project templates')
-      %button.btn.js-settings-toggle{ type: 'button' }
+      %button.btn.gl-button.js-settings-toggle{ type: 'button' }
        = expanded ? _('Collapse') : _('Expand')
      %p
        = _('Select the custom project template source group.')

--- a/ee/app/views/admin/application_settings/_templates.html.haml
+++ b/ee/app/views/admin/application_settings/_templates.html.haml
@@ -3,7 +3,7 @@
    .settings-header
      %h4
        = _('Templates')
-      %button.btn.js-settings-toggle{ type: 'button' }
+      %button.btn.gl-button.js-settings-toggle{ type: 'button' }
        = expanded ? _('Collapse') : _('Expand')
      %p
        = _('Set instance-wide template repository')