diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-03 21:27:34 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-03 21:27:34 +0000 |
| commit | 21e4f0534d2d9faa5ef9826b990ed32e90ea0426 (patch) | |
| tree | 5d3b2873df822adc062d2b4be851ce958d93ec76 /app/assets/stylesheets | |
| parent | c1e2da9293bb036280c05ee6b99952b067bdc316 (diff) | |
| parent | f8fabfcc6ff6be4e20e3cc9353be86b7cf53af47 (diff) | |
| download | gitlab-ce-21e4f0534d2d9faa5ef9826b990ed32e90ea0426.tar.gz | |
Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'
Allow commenting on older versions of the diff and comparisons between diff versions
See merge request !10388
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 1b4694377b3..feefaad8a15 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -425,12 +425,6 @@ float: right; } -.diffs { - .content-block { - border-bottom: none; - } -} - .files-changed { border-bottom: none; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 6a419384a34..bca62b7fc31 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -511,7 +511,6 @@ .mr-version-controls { background: $gray-light; - border-bottom: 1px solid $border-color; color: $gl-text-color; .mr-version-menus-container { |