summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss30
1 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index f4488ccd8fe..75c57e369e7 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -131,12 +131,6 @@
line-height: 16px;
}
- @media (min-width: $screen-sm-min) {
- .stage-cell {
- padding: 0 4px;
- }
- }
-
@media (max-width: $screen-xs-max) {
order: 1;
margin-top: $gl-padding-top;
@@ -182,8 +176,7 @@
}
&.mr-memory-usage {
- margin-top: 10px;
- margin-bottom: 10px;
+ margin: 5px 0 10px 25px;
}
}
@@ -511,7 +504,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 +729,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) {