Commit a96ca241 authored by David O'Regan's avatar David O'Regan

Merge branch 'btn-confirm-clusters' into 'master'

Move from btn-success to btn-confirm in clusters directory

See merge request gitlab-org/gitlab!56205
parents 7dc02ae2 f76ce06a
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.text-muted .text-muted
= html_escape(s_('ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes %{code_open}cluster-admin%{code_close} privileges.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } = html_escape(s_('ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes %{code_open}cluster-admin%{code_close} privileges.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
= link_to _('More information'), help_page_path('user/clusters/management_project.md'), target: '_blank' = link_to _('More information'), help_page_path('user/clusters/management_project.md'), target: '_blank'
= field.submit _('Save changes'), class: 'btn gl-button btn-success' = field.submit _('Save changes'), class: 'btn gl-button btn-confirm'
.sub-section.form-group .sub-section.form-group
%h4 %h4
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
.top-area.adjust .top-area.adjust
.gl-display-block.gl-text-right.gl-my-4.gl-w-full .gl-display-block.gl-text-right.gl-my-4.gl-w-full
- if clusterable.can_add_cluster? - if clusterable.can_add_cluster?
= link_to s_('ClusterIntegration|Connect cluster with certificate'), clusterable.new_path, class: 'btn gl-button btn-success js-add-cluster gl-py-2', qa_selector: :integrate_kubernetes_cluster_button = link_to s_('ClusterIntegration|Connect cluster with certificate'), clusterable.new_path, class: 'btn gl-button btn-confirm js-add-cluster gl-py-2', qa_selector: :integrate_kubernetes_cluster_button
- else - else
%span.btn.gl-button.btn-success.js-add-cluster.disabled.gl-py-2 %span.btn.gl-button.btn-confirm.js-add-cluster.disabled.gl-py-2
= s_("ClusterIntegration|Connect cluster with certificate") = s_("ClusterIntegration|Connect cluster with certificate")
#js-clusters-list-app{ data: js_clusters_list_data(clusterable.index_path(format: :json)) } #js-clusters-list-app{ data: js_clusters_list_data(clusterable.index_path(format: :json)) }
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
- if clusterable.can_add_cluster? - if clusterable.can_add_cluster?
.gl-text-center .gl-text-center
= link_to s_('ClusterIntegration|Integrate with a cluster certificate'), clusterable.new_path, class: 'gl-button btn btn-success', data: { qa_selector: 'add_kubernetes_cluster_link' } = link_to s_('ClusterIntegration|Integrate with a cluster certificate'), clusterable.new_path, class: 'gl-button btn btn-confirm', data: { qa_selector: 'add_kubernetes_cluster_link' }
...@@ -55,4 +55,4 @@ ...@@ -55,4 +55,4 @@
= render('clusters/clusters/namespace', platform_field: platform_field, field: field) = render('clusters/clusters/namespace', platform_field: platform_field, field: field)
.form-group .form-group
= field.submit s_('ClusterIntegration|Save changes'), class: 'gl-button btn btn-success' = field.submit s_('ClusterIntegration|Save changes'), class: 'gl-button btn btn-confirm'
...@@ -85,4 +85,4 @@ ...@@ -85,4 +85,4 @@
.form-group.js-gke-cluster-creation-submit-container .form-group.js-gke-cluster-creation-submit-container
= field.submit s_('ClusterIntegration|Create Kubernetes cluster'), = field.submit s_('ClusterIntegration|Create Kubernetes cluster'),
class: 'js-gke-cluster-creation-submit gl-button btn btn-success', disabled: true class: 'js-gke-cluster-creation-submit gl-button btn btn-confirm', disabled: true
...@@ -60,4 +60,4 @@ ...@@ -60,4 +60,4 @@
= render('clusters/clusters/namespace', platform_field: platform_kubernetes_field) = render('clusters/clusters/namespace', platform_field: platform_kubernetes_field)
.form-group .form-group
= field.submit s_('ClusterIntegration|Add Kubernetes cluster'), class: 'gl-button btn btn-success', data: { qa_selector: 'add_kubernetes_cluster_button' } = field.submit s_('ClusterIntegration|Add Kubernetes cluster'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'add_kubernetes_cluster_button' }
---
title: Move from btn-success to btn-confirm in clusters directory
merge_request: 56205
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