diff options
| author | kushalpandya <kushal@gitlab.com> | 2017-06-01 13:25:48 +0530 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-01 13:25:48 +0530 |
| commit | 4826ae074f2757e2ca7cddbb201688a11bcf8f8b (patch) | |
| tree | c87c7065eb8d89aab26b6490acca752ef19ae29b | |
| parent | b83a40483ad5f87b3e08c3ed2d090b5d87bdac27 (diff) | |
| download | gitlab-ce-4826ae074f2757e2ca7cddbb201688a11bcf8f8b.tar.gz | |
Changes based on UX review
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/services/prometheus/_show.html.haml | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 7c99eef3406..deed4501399 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -73,11 +73,12 @@ .loading-metrics, .empty-metrics { text-align: center; - padding: 20px 10px; + padding: 30px 10px; p, .btn { margin-top: 10px; + margin-bottom: 0; } p { @@ -85,13 +86,17 @@ } } + .loading-metrics .fa-spin { + color: $loading-color; + } + .metrics-list { list-style-type: none; margin: 0; padding: 0; li { - padding: 15px 10px; + padding: 16px; .badge-count { background: $badge-bg; diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index bf8bfe4ddcb..82d4dd2488f 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -31,7 +31,7 @@ .panel-heading %h3.panel-title = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') - Missing environment variable(s) + Missing environment variable %span.badge-count.js-env-var-count 0 .panel-body.hidden .flash-container @@ -40,6 +40,6 @@ To set up automatic monitoring, add the environment variable %code $CI_ENVIRONMENT_SLUG - to exporter's queries. + to exporter’s queries. = link_to 'More information', '#' %ul.metrics-list.js-missing-var-metrics-list |