diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-04 21:52:38 +0000 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-04 21:52:38 +0000 |
commit | 9309bf310c31ca21307783cf396b82dd1562a8db (patch) | |
tree | dff5afb837b30eba7b8290aee54224a786a4e7bd | |
parent | e264046c595704f8004a0b8442eec3d2cbb1c75b (diff) | |
parent | 56d70009b1e6fb55870c132209b152bad2a7f086 (diff) | |
download | gitlab-ce-9309bf310c31ca21307783cf396b82dd1562a8db.tar.gz |
Merge branch '46754-error-message' into 'master'
Resolve "Error message after installing ingress does not ocupy full width"
Closes #46754
See merge request gitlab-org/gitlab-ce!19376
-rw-r--r-- | app/assets/javascripts/clusters/components/application_row.vue | 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/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index 30567993322..98c0b9c22a8 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -187,7 +187,7 @@ role="row" > <div - class="alert alert-danger alert-block append-bottom-0" + class="alert alert-danger alert-block append-bottom-0 clusters-error-alert" role="gridcell" > <div> diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 3e4d123242c..56beb7718a4 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -13,6 +13,10 @@ max-width: 100%; } +.clusters-error-alert { + width: 100%; +} + .clusters-container { .nav-bar-right { padding: $gl-padding-top $gl-padding; |