diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 18:06:06 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 18:06:06 +0300 |
| commit | 58bf29da46ed926a501e8309dba6002634bd0cad (patch) | |
| tree | bd4872d6c3456254b7a008df3c1bd1e8edcfc056 /app/views | |
| parent | e15fc89dd8f57f50cc5c15e6ad832eb2ebc6e985 (diff) | |
| parent | 44baf2b0f4fdfe7402014484ad71a7d497d28088 (diff) | |
Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of gitlab.com:gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/clusters/login.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/clusters/login.html.haml b/app/views/projects/clusters/login.html.haml index 1492f6163e1..5023abc5aa0 100644 --- a/app/views/projects/clusters/login.html.haml +++ b/app/views/projects/clusters/login.html.haml @@ -4,7 +4,7 @@ .col-sm-8 = render 'header' .row - .col-sm-8.col-sm-offset-4 + .col-sm-8.col-sm-offset-4.signin-with-google - if @authorize_url = link_to @authorize_url do = image_tag('auth_buttons/signin_with_google.png') diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml index f3124acfa1c..48d9835d588 100644 --- a/app/views/projects/clusters/show.html.haml +++ b/app/views/projects/clusters/show.html.haml @@ -54,7 +54,7 @@ %label{ for: 'cluter_name' } = s_('ClusterIntegration|Cluster name') .input-group - %input.form-control{ value: @cluster.gcp_cluster_name, disabled: true} + %input.form-control.cluster-name{ value: @cluster.gcp_cluster_name, disabled: true} %span.input-group-addon.clipboard-addon = clipboard_button(text: @cluster.gcp_cluster_name, title: s_('ClusterIntegration|Copy cluster name')) |