diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-17 12:35:51 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-17 12:35:51 +0100 |
| commit | cfe06bcd63b465f397f11b71d8f86b2914eb4069 (patch) | |
| tree | 1a3019065db5375f9a14800157cceed00c64f1bc | |
| parent | 323f8ecc1459872965273e4965eb462162dee696 (diff) | |
| download | gitlab-ce-fl-gke-collapsible-containers.tar.gz | |
Improvements after reviewfl-gke-collapsible-containers
| -rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/clusters/_advanced_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/show.html.haml | 8 |
3 files changed, 5 insertions, 13 deletions
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 296231dc189..8d6f30e3b84 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -1,12 +1,4 @@ .edit-cluster-form { - .cluster-content-block { - padding-right: 110px; - - @media(max-width: $screen-sm-max) { - padding-right: 20px; - } - } - .clipboard-addon { background-color: $white-light; } diff --git a/app/views/projects/clusters/_advanced_settings.html.haml b/app/views/projects/clusters/_advanced_settings.html.haml index ceefafcce31..6c162481dd8 100644 --- a/app/views/projects/clusters/_advanced_settings.html.haml +++ b/app/views/projects/clusters/_advanced_settings.html.haml @@ -1,6 +1,6 @@ - if can?(current_user, :admin_cluster, @cluster) .append-bottom-20 - %label.append-bottom-10{ for: 'google-container-engine' } + %label.append-bottom-10 = s_('ClusterIntegration|Google Container Engine') %p - link_gke = link_to(s_('ClusterIntegration|Google Container Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer') diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml index 63e37470abc..ff76abc3553 100644 --- a/app/views/projects/clusters/show.html.haml +++ b/app/views/projects/clusters/show.html.haml @@ -12,16 +12,16 @@ %section.settings %h4= s_('ClusterIntegration|Enable cluster integration') - .cluster-content-block + .settings-content.expanded - .hidden.js-cluster-error.alert.alert-danger.alert-block{ role: 'alert' } + .hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' } = s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine') %p.js-error-reason - .hidden.js-cluster-creating.alert.alert-info.alert-block{ role: 'alert' } + .hidden.js-cluster-creating.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' } = s_('ClusterIntegration|Cluster is being created on Google Container Engine...') - .hidden.js-cluster-success.alert.alert-success.alert-block{ role: 'alert' } + .hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10{ role: 'alert' } = s_('ClusterIntegration|Cluster was successfully created on Google Container Engine') %p |