diff options
| author | winh <winnie@gitlab.com> | 2017-06-21 15:25:11 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-06-21 15:25:11 +0200 |
| commit | 40eb82536836904b87c89b2e2d4653c7503fdfd8 (patch) | |
| tree | 7b1553f815ad6e5793875bcabdddcaeb3634fb16 /app/assets/stylesheets/pages/merge_requests.scss | |
| parent | cf3cdd48bb4959cb277752a16a4b98b7f4a4f3c4 (diff) | |
| download | gitlab-ce-40eb82536836904b87c89b2e2d4653c7503fdfd8.tar.gz | |
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d
This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing
changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index c0bd045f1fc..2dc7f73a295 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -372,10 +372,6 @@ margin-left: 12px; } - &.mr-state-locked + .mr-info-list.mr-links { - margin-top: -16px; - } - &.empty-state { .artwork { margin-bottom: $gl-padding; |