diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-06 15:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-06 15:08:36 +0300 |
commit | c1f785fe21ee785618ef3bf0407fee166b6e0ecd (patch) | |
tree | 4807aa3c9dfa10ac1e52554057e407b1af310888 /app/views/clusters | |
parent | 5d3eac1cf8820b5f95bf2085ccc246ea78f4b4d2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
-rw-r--r-- | app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml | 7 | ||||
-rw-r--r-- | app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml b/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml index bed671832f3..3e0a8a4f88b 100644 --- a/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml +++ b/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml @@ -2,10 +2,11 @@ - help_path = local_assigns.fetch(:help_path) - label = local_assigns.fetch(:label) - last = local_assigns.fetch(:last, false) -- classes = ["btn btn-confirm gl-button btn-confirm-secondary gl-flex-direction-column gl-w-half"] +- classes = ["btn btn-confirm gl-button btn-confirm-secondary gl-flex-direction-column gl-flex-basis-0 gl-flex-grow-1 gl-min-w-0"] - conditional_classes = [("gl-mr-5" unless last)] = link_to help_path, class: classes + conditional_classes do - .svg-content.gl-p-3= image_tag logo_path, alt: label, class: "gl-w-64 gl-h-64" - %span + %span.gl-display-flex.gl-align-items-center.gl-m-3.gl-h-64 + = image_tag logo_path, alt: label, class: "gl-w-15 gl-max-h-full gl-max-w-full" + %span.gl-white-space-normal = label diff --git a/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml b/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml index e4128ee22a4..7039ce57bd9 100644 --- a/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml +++ b/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml @@ -1,14 +1,18 @@ - gke_label = s_('ClusterIntegration|Google GKE') - eks_label = s_('ClusterIntegration|Amazon EKS') +- civo_label = s_('ClusterIntegration|Civo Kubernetes') - create_cluster_label = s_('ClusterIntegration|Where do you want to create a cluster?') -- eks_help_path = help_page_path('user/infrastructure/clusters/connect/new_eks_cluster') -- gke_help_path = help_page_path('user/infrastructure/clusters/connect/new_gke_cluster') +- eks_help_path = help_page_path('user/infrastructure/clusters/connect/new_eks_cluster.md') +- gke_help_path = help_page_path('user/infrastructure/clusters/connect/new_gke_cluster.md') +- civo_help_path = help_page_path('user/infrastructure/clusters/connect/new_civo_cluster.md') -.gl-p-5 +.gl-py-5.gl-md-pl-5.gl-md-pr-5 %h4.gl-mb-5 = create_cluster_label .gl-display-flex = render partial: 'clusters/clusters/cloud_providers/cloud_provider_button', locals: { label: eks_label, logo_path: 'illustrations/logos/amazon_eks.svg', help_path: eks_help_path } = render partial: 'clusters/clusters/cloud_providers/cloud_provider_button', + locals: { label: civo_label, logo_path: 'illustrations/third-party-logos/civo.svg', help_path: civo_help_path } + = render partial: 'clusters/clusters/cloud_providers/cloud_provider_button', locals: { label: gke_label, logo_path: 'illustrations/logos/google_gke.svg', help_path: gke_help_path, last: true } |