Commit 8467a11c authored by David O'Regan's avatar David O'Regan

Merge branch 'btn-confirm-project-pages' into 'master'

Move from btn-success to btn-confirm in pages

See merge request gitlab-org/gitlab!56348
parents f6798bfb 52e0de81
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%span.badge.badge-danger %span.badge.badge-danger
= s_('GitLabPages|Expired') = s_('GitLabPages|Expired')
%div %div
= link_to s_('GitLabPages|Edit'), project_pages_domain_path(@project, domain), class: "btn gl-button btn-sm btn-grouped btn-success btn-inverted" = link_to s_('GitLabPages|Edit'), project_pages_domain_path(@project, domain), class: "btn gl-button btn-sm btn-grouped btn-confirm btn-inverted"
= link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-danger btn-sm btn-grouped" = link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-danger btn-sm btn-grouped"
- if domain.needs_verification? - if domain.needs_verification?
%li.list-group-item.bs-callout-warning %li.list-group-item.bs-callout-warning
......
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
= s_('GitLabPages|Force HTTPS (requires valid certificates)') = s_('GitLabPages|Force HTTPS (requires valid certificates)')
.gl-mt-3 .gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn btn-success gl-button' = f.submit s_('GitLabPages|Save'), class: 'btn btn-confirm gl-button'
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= s_('GitLabPages|Pages') = s_('GitLabPages|Pages')
- if can?(current_user, :update_pages, @project) && (Gitlab.config.pages.external_http || Gitlab.config.pages.external_https) - if can?(current_user, :update_pages, @project) && (Gitlab.config.pages.external_http || Gitlab.config.pages.external_https)
= link_to new_project_pages_domain_path(@project), class: 'btn gl-button btn-success float-right', title: s_('GitLabPages|New Domain') do = link_to new_project_pages_domain_path(@project), class: 'btn gl-button btn-confirm float-right', title: s_('GitLabPages|New Domain') do
= s_('GitLabPages|New Domain') = s_('GitLabPages|New Domain')
%p.light %p.light
......
---
title: Move from btn-success to btn-confirm in pages directory
merge_request: 56348
author: Yogi (@yo)
type: changed
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