summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-26 15:30:53 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-04-26 15:30:53 +0000
commitbb6908cd5bcb14d70dfadbc2a16d7310bfa65445 (patch)
tree3438d5a7d68bf44356839738a93f35c9b0e03542
parent0af0e0fb1d6889752fdc710ef1ba736e4e3c8a54 (diff)
parent254c49afcacea7ae543162b30696703384433487 (diff)
downloadgitlab-ce-bb6908cd5bcb14d70dfadbc2a16d7310bfa65445.tar.gz
Merge branch '3713-cross-project-environments-dashboard-mvc-backport' into 'master'
Backport Environments Dashboard SCSS Changes See merge request gitlab-org/gitlab-ce!27498
-rw-r--r--app/assets/stylesheets/components/dashboard_skeleton.scss8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/stylesheets/components/dashboard_skeleton.scss b/app/assets/stylesheets/components/dashboard_skeleton.scss
index 9775c329922..a104d035a9a 100644
--- a/app/assets/stylesheets/components/dashboard_skeleton.scss
+++ b/app/assets/stylesheets/components/dashboard_skeleton.scss
@@ -11,7 +11,7 @@
}
&-body {
- height: 120px;
+ min-height: 120px;
&-warning {
background-color: $orange-50;
@@ -22,10 +22,8 @@
}
}
- &-time-ago {
- &-icon {
- color: $gray-500;
- }
+ &-icon {
+ color: $gray-500;
}
&-footer {