summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-12 16:37:07 +0000
committerPhil Hughes <me@iamphill.com>2018-03-13 09:41:09 +0000
commit3dcfb6cb16b14e806d642f024eccf269f97acede (patch)
tree9dfce6f398e4df912e48c40281ba059b9fa6584b
parent611601430dde46562b0049c5b5f5be656f7caae2 (diff)
downloadgitlab-ce-3dcfb6cb16b14e806d642f024eccf269f97acede.tar.gz
fixed scss-lint
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index d1d35285036..c6abf5dd85f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -718,6 +718,8 @@
}
.mr-memory-usage {
+ width: 100%;
+
p.usage-info-loading .usage-info-load-spinner {
margin-right: 10px;
font-size: 16px;
@@ -763,7 +765,3 @@
max-width: 100%;
}
}
-
-.mr-memory-usage {
- width: 100%;
-}