diff options
| author | kushalpandya <kushal@gitlab.com> | 2017-05-09 17:00:22 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-05-09 17:00:22 +0300 |
| commit | f66006169bf94de749bfdcb9b57ca178f4bf6f68 (patch) | |
| tree | 4f6bda983f92df7e940f5573b37171e6426b5fa9 /app/assets/stylesheets/pages/merge_requests.scss | |
| parent | 7ea12d8067357f8e846e26b05a1dc4ab3d5a5a93 (diff) | |
Add Prometheus memory sparkline to MR widget
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index f4488ccd8fe..97019b19667 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -182,8 +182,7 @@ } &.mr-memory-usage { - margin-top: 10px; - margin-bottom: 10px; + margin: 5px 0 10px 25px; } } @@ -511,7 +510,12 @@ .mr-info-list.mr-memory-usage { .legend { - height: 75%; + height: 65%; + top: 0; + + @media (max-width: $screen-xs-max) { + height: 20px; + } } p { @@ -731,13 +735,15 @@ } .mr-memory-usage { - p.usage-info-loading { - margin-bottom: 6px; + p.usage-info-loading, + p.usage-info-unavailable, + p.usage-info-failed { + margin-bottom: 5px; + } - .usage-info-load-spinner { - margin-right: 10px; - font-size: 16px; - } + p.usage-info-loading .usage-info-load-spinner { + margin-right: 10px; + font-size: 16px; } @media (max-width: $screen-md-min) { |