diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 11:29:32 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 11:29:32 +0000 |
commit | bdbc9884348515f71530efc2759c05d794f8547e (patch) | |
tree | 884fa9b43caee70c87a9625f32fa2a033303a44b /app/assets | |
parent | bca8ea33b3dcca926bbb3fe3a75d0dca33215f8f (diff) | |
parent | 5ae95b1880f99bf0414dccacc51b624c00d6b305 (diff) | |
download | gitlab-ce-bdbc9884348515f71530efc2759c05d794f8547e.tar.gz |
Merge branch 'improve-diff-ui' into 'master'
Add space to separate different files in diff
I propose to add some visual separation between files in diff. Originally this separation was removed in 8.0 because of different UI layout. Now when we have white layout back I think it will be better to add some space between files.
- - -
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !3275
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index db06b8288c2..d5862a11aca 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -1,7 +1,7 @@ // Common .diff-file { border: 1px solid $border-color; - border-top: none; + margin-bottom: $gl-padding; .diff-header { position: relative; @@ -361,3 +361,11 @@ border-color: $border; } } + +.files { + margin-top: -1px; + + .diff-file:last-child { + margin-bottom: 0; + } +} |