diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 13:31:07 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 13:31:07 +0100 |
| commit | 2fc29237aacd8df778ede532e450d06c79c63004 (patch) | |
| tree | ffafca695f63d92897ce543c3c51fbf73a403d5d /app/assets | |
| parent | 9429514e303bdceee0621b5c4bf02ad8ca0a7add (diff) | |
| parent | f1357a1e15bead6b58c049357c765dd991c04d9b (diff) | |
| download | gitlab-ce-2fc29237aacd8df778ede532e450d06c79c63004.tar.gz | |
Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-page-with-list-clusters
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/clusters/clusters_index.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/clusters/clusters_index.js b/app/assets/javascripts/clusters/clusters_index.js index 82ac8d93035..6844d1dbd83 100644 --- a/app/assets/javascripts/clusters/clusters_index.js +++ b/app/assets/javascripts/clusters/clusters_index.js @@ -28,7 +28,7 @@ const toggleValue = (button) => { * * When the user clicks the toggle button for each cluster, it: * - toggles the button - * - shows a loading and disabled state + * - shows a loading and disables button * - Makes a put request to the given endpoint * Once we receive the response, either: * 1) Show updated status in case of successfull response diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index b5ac6db04ad..c303f016ff9 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -23,4 +23,8 @@ .empty-state .svg-content img { width: 145px; } + + .top-area .nav-controls > .btn.btn-add-cluster { + margin-right: 0; + } } |