diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 17:49:58 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 17:49:58 +0900 |
| commit | 8638cf66d9212143749a85b4429b52fde2169026 (patch) | |
| tree | 1055c09666748b8f731d70920d356dec5b541e0e /app/assets/stylesheets | |
| parent | 09aec97d14738bc156835f50609ec8638b435ca3 (diff) | |
| parent | 86d8531748208efdbc430c552bbb89567c86378d (diff) | |
| download | gitlab-ce-8638cf66d9212143749a85b4429b52fde2169026.tar.gz | |
Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index c4a95afc4d2..b2f26cf7159 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -294,6 +294,7 @@ .btn-align-content { display: flex; + justify-content: center; align-items: center; } diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 5c91579c69c..b9bfae9356c 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -3,3 +3,8 @@ background-color: $white-light; } } + +.cluster-applications-table { + // Wait for the Vue to kick-in and render the applications block + min-height: 179px; +} |