Commit ad343069 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '231064-update-settings-buttons-to-pajamas' into 'master'

Update protected branches buttons to pajamas style

See merge request gitlab-org/gitlab!54612
parents 1fb966e3 01f35637
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
.selected-icon.gl-mr-3 .selected-icon.gl-mr-3
.selected-template .selected-template
.input-group-append .input-group-append
%button.btn.btn-default.change-template{ type: "button" } %button.btn.gl-button.btn-default.change-template{ type: "button" }
= _('Change template') = _('Change template')
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
= yield :push_access_levels = yield :push_access_levels
= render_if_exists 'projects/protected_branches/ee/code_owner_approval_form', f: f = render_if_exists 'projects/protected_branches/ee/code_owner_approval_form', f: f
.card-footer .card-footer
= f.submit s_('ProtectedBranch|Protect'), class: 'btn-success btn', disabled: true, data: { qa_selector: 'protect_button' } = f.submit s_('ProtectedBranch|Protect'), class: 'btn-success gl-button btn', disabled: true, data: { qa_selector: 'protect_button' }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.settings-header .settings-header
%h4 %h4
Protected branches Protected branches
%button.btn.js-settings-toggle.qa-expand-protected-branches{ type: 'button' } %button.btn.gl-button.js-settings-toggle.qa-expand-protected-branches{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
Keep stable branches secure, and force developers to use merge requests. #{link_to "What are protected branches?", help_page_path("user/project/protected_branches")} Keep stable branches secure, and force developers to use merge requests. #{link_to "What are protected branches?", help_page_path("user/project/protected_branches")}
......
---
title: Update protected branches buttons to pajamas style
merge_request: 54612
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