summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/diff.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-17 15:22:44 +0000
committerPhil Hughes <me@iamphill.com>2018-04-17 15:22:44 +0000
commit606ed05edff01824e0f15a37fa23bd9dacc0cee4 (patch)
tree7571dad887de0d81c74943c571833cad63f60739 /app/assets/stylesheets/pages/diff.scss
parent1a420fd25f4b06504b4f5e338c93a76a66a6564a (diff)
parent8df69aac04f46f17ce11dbda8ac8568394a34412 (diff)
downloadgitlab-ce-606ed05edff01824e0f15a37fa23bd9dacc0cee4.tar.gz
Merge branch '45271-collpased-diff-loading' into 'master'
Resolve "Collapsed diff spacing wrong when failed to load" Closes #45271 and #45317 See merge request gitlab-org/gitlab-ce!18351
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r--app/assets/stylesheets/pages/diff.scss5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 7f037582ca0..11052be40a8 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -160,6 +160,11 @@
}
}
}
+
+ .diff-loading-error-block {
+ padding: $gl-padding * 2 $gl-padding;
+ text-align: center;
+ }
}
.image {