Commit 9586392c authored by Illya Klymov's avatar Illya Klymov

Merge branch '231160-update-push-hook-buttons' into 'master'

Add gl-button style to admin area

See merge request gitlab-org/gitlab!49610
parents 43aad8f7 d4b700ba
...@@ -24,5 +24,5 @@ ...@@ -24,5 +24,5 @@
.card.trial-license-preview.gl-mt-5 .card.trial-license-preview.gl-mt-5
= license_key = license_key
.modal-footer.form-actions .modal-footer.form-actions
%button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel %button.btn.gl-button.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel
= f.submit 'Install license', class: 'gl-button btn btn-primary' = f.submit 'Install license', class: 'gl-button btn btn-primary'
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.settings-header .settings-header
%h4 %h4
= _('Merge requests approvals') = _('Merge requests approvals')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings.') = _('Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings.')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.settings-header .settings-header
%h4 %h4
= _('Push Rules') = _('Push Rules')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Rules that define what git pushes are accepted for a project. All newly created projects will use these settings.') = _('Rules that define what git pushes are accepted for a project. All newly created projects will use these settings.')
......
---
title: Add gl-button style to admin area
merge_request: 49610
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment